Flamefire 73e4a9fa74 Merge branch 'release-0.3' into develop ...

Conflicts:
	Vocaluxe/Base/CConfig.cs
	Vocaluxe/Lib/Playlist/CPlaylistFile.cs
	Vocaluxe/Screens/CScreenSong.cs
	VocaluxeLib/CHelper.cs
	VocaluxeLib/Menu/CMenu.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
	VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs

2013-10-19 00:42:56 +02:00

..

SingNotes

Fix overlapping notes

2013-10-11 14:50:27 +02:00

SongMenu

Merge branch 'release-0.3' into develop

2013-10-19 00:42:56 +02:00

CBackground.cs

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

CButton.cs

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

CEqualizer.cs

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

CInteraction.cs

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

CLyric.cs

Easier logging in SongLoader

2013-10-11 14:50:31 +02:00

CMenu.cs

Merge branch 'release-0.3' into develop

2013-10-19 00:42:56 +02:00

CMenuParty.cs

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

CNameSelection.cs

Merge branch 'release-0.3' into develop

2013-10-14 22:02:02 +02:00

CObjectInteractions.cs

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

COrderedDictionaryLite.cs

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

CParticle.cs

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

CPlaylist.cs

Use IsGameModeAvail for duet check

2013-10-12 21:50:39 +02:00

CScreenSetting.cs

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

CSelectSlide.cs

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

CStatic.cs

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

CText.cs

Fix overlapping notes

2013-10-11 14:50:27 +02:00

IMenu.cs

Fix file headers and indentations

2013-09-20 18:09:32 +02:00

IMenuElement.cs

Fix file headers and indentations

2013-09-20 18:09:32 +02:00