Merge remote-tracking branch 'remotes/origin/bugfix-0.1.1' into develop

Conflicts:
	Vocaluxe/Base/CSettings.cs
This commit is contained in:
Alexander Eckart committed 2012-04-09 11:14:54 +02:00
commit 70192b8213
2 files changed
+3 -8

No files matched your search

+2 -2
View File
@@ -43,11 +43,11 @@ namespace Vocaluxe.Base
public const string sProgramCodeName = "Rising Star";
public const int iVersionMajor = 0;
public const int iVersionMinor = 1; // milestones
public const int iVersionMinor = 2; // milestones
public const int iVersionSub = 0; // steps
public const ERevision VersionRevision = ERevision.Alpha;
public const int iBuild = 60; // Increase on every published version! Never Reset!
public const int iBuild = 61; // Increase on every published version! Never Reset!
public const int iDatabaseHighscoreVersion = 1;
public const int iDatabaseCoverVersion = 1;