Merge branch 'develop' into popup-control

Conflicts:
	Vocaluxe/Program.cs
This commit is contained in:
Alexander Eckart committed 2012-04-08 20:06:56 +02:00
commit 14aa49d65d
22 files changed
+312 -191

No files matched your search

+2 -2
View File
@@ -45,9 +45,9 @@ namespace Vocaluxe.Base
public const int iVersionMajor = 0;
public const int iVersionMinor = 1; // milestones
public const int iVersionSub = 0; // steps
public const ERevision VersionRevision = ERevision.RC;
public const ERevision VersionRevision = ERevision.Alpha;
public const int iBuild = 59; // Increase on every published version! Never Reset!
public const int iBuild = 60; // Increase on every published version! Never Reset!
public const int iDatabaseHighscoreVersion = 1;
public const int iDatabaseCoverVersion = 1;