diff --git a/BizHawk.Client.EmuHawk/AboutBox.cs b/BizHawk.Client.EmuHawk/AboutBox.cs index e2de7b791d..cf51d75e5e 100644 --- a/BizHawk.Client.EmuHawk/AboutBox.cs +++ b/BizHawk.Client.EmuHawk/AboutBox.cs @@ -160,11 +160,11 @@ namespace BizHawk.Client.EmuHawk private void AboutBox_Load(object sender, EventArgs e) { #if DEBUG - Text = "BizHawk Developer Build (DEBUG MODE) SVN r" + SubWCRev.SVN_REV; + Text = "BizHawk Developer Build (DEBUG MODE) GIT " + SubWCRev.GIT_BRANCH + "-"+SubWCRev.SVN_REV; #else - Text = "BizHawk Developer Build (RELEASE MODE) SVN r" + SubWCRev.SVN_REV; + Text = "BizHawk Developer Build (RELEASE MODE) GIT " + SubWCRev.GIT_BRANCH + "-"+SubWCRev.SVN_REV; #endif - if (DateTime.Now.Month == 12) + if (DateTime.Now.Month == 12) if (DateTime.Now.Day > 17 && DateTime.Now.Day <= 25) { pictureBox1.Image = Properties.Resources.alt_about_image; diff --git a/BizHawk.Client.EmuHawk/BizBox.cs b/BizHawk.Client.EmuHawk/BizBox.cs index 832956d372..f267d86646 100644 --- a/BizHawk.Client.EmuHawk/BizBox.cs +++ b/BizHawk.Client.EmuHawk/BizBox.cs @@ -28,11 +28,11 @@ namespace BizHawk.Client.EmuHawk { if (VersionInfo.DeveloperBuild) { - Text = " BizHawk (SVN r" + SubWCRev.SVN_REV + ")"; + Text = " BizHawk (GIT " + SubWCRev.GIT_BRANCH + "-" + SubWCRev.SVN_REV + ")"; } else { - Text = "Version " + VersionInfo.MAINVERSION + " (SVN " + SubWCRev.SVN_REV + ")"; + Text = "Version " + VersionInfo.MAINVERSION + " (GIT " + SubWCRev.GIT_BRANCH + "-" + SubWCRev.SVN_REV + ")"; } VersionLabel.Text = "Version " + VersionInfo.MAINVERSION + " " + VersionInfo.RELEASEDATE; diff --git a/Version/svnrev_template b/Version/svnrev_template index 31c5a95c9c..570e7ddc2e 100644 --- a/Version/svnrev_template +++ b/Version/svnrev_template @@ -1,4 +1,5 @@ static class SubWCRev { public const string SVN_REV = "$WCREV$"; + public const string GIT_BRANCH = "$WCBRANCH$"; }