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
This commit is contained in:
Alexander Eckart committed 2012-06-24 21:23:50 +02:00
commit 74313cf1bd
140 files changed
+123583 -1619

No files matched your search

+1 -1
View File
@@ -47,7 +47,7 @@ namespace Vocaluxe.Base
public const int iVersionSub = 0; // patches
public const ERevision VersionRevision = ERevision.Alpha;
public const int iBuild = 66; // Increase on every published version! Never Reset!
public const int iBuild = 67; // Increase on every published version! Never Reset!
public const int iDatabaseHighscoreVersion = 1;
public const int iDatabaseCoverVersion = 1;