Alexander Eckart 74313cf1bd Merge branch 'develop' into medley ...

Conflicts:
	Output/Themes/Ambient/Skin Blue.xml
	Output/Themes/Ambient/Skin Green.xml
	Output/Themes/Ambient/Skin Red.xml
	Output/Themes/Ambient/Skin Yellow.xml
	Vocaluxe/Screens/CPopupScreenPlayerControl.cs

2012-06-24 21:23:50 +02:00

..

PopupScreenPlayerControl.xml

fixed typo

2012-06-21 20:07:08 +02:00

ScreenHighscore.xml

fixed typo

2012-06-21 20:07:08 +02:00

ScreenLoad.xml

fixed typo

2012-06-21 20:07:08 +02:00

ScreenMain.xml

fixed typo

2012-06-21 20:07:08 +02:00

ScreenNames.xml

fixed typo

2012-06-21 20:07:08 +02:00

ScreenOptions.xml

fixed typo

2012-06-21 20:07:08 +02:00

ScreenOptionsGame.xml

fixed typo

2012-06-21 20:07:08 +02:00

ScreenOptionsLyrics.xml

fixed typo

2012-06-21 20:07:08 +02:00

ScreenOptionsRecord.xml

fixed typo

2012-06-21 20:07:08 +02:00

ScreenOptionsSound.xml

fixed typo

2012-06-21 20:07:08 +02:00

ScreenOptionsTheme.xml

fixed typo

2012-06-21 20:07:08 +02:00

ScreenOptionsVideo.xml

fixed typo

2012-06-21 20:07:08 +02:00

ScreenProfiles.xml

fixed typo

2012-06-21 20:07:08 +02:00

ScreenScore.xml

fixed typo

2012-06-21 20:07:08 +02:00

ScreenSing.xml

fixed typo

2012-06-21 20:07:08 +02:00

ScreenSong.xml

Merge branch 'develop' into medley

2012-06-24 21:23:50 +02:00

ScreenTest.xml

added covers and theme files

2012-02-19 15:24:40 +01:00