stable: mark as "2.0 RC1"

git-svn-id: https://dolphin-emu.googlecode.com/svn/branches/stable@5167 8ced0084-cf51-0410-be5f-012b33b47a6e

7 files changed, 9 insertions, 8 deletions

diff --git a/Source/Core/DolphinWX/DolphinWX.vcproj b/Source/Core/DolphinWX/DolphinWX.vcproj
index f8b8c85083..72ad005282 100644
--- a/Source/Core/DolphinWX/DolphinWX.vcproj
+++ b/Source/Core/DolphinWX/DolphinWX.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9,00"

+	Version="9.00"

 	Name="Dolphin"

 	ProjectGUID="{A72606EF-C5C1-4954-90AD-F0F93A8D97D9}"

 	RootNamespace="DolphinWX"

@@ -31,7 +31,7 @@
 			<Tool

 				Name="VCPreBuildEventTool"

 				CommandLine="&quot;$(ProjectDir)..\Common\SubWCRev.exe&quot; &quot;$(SolutionDir)\.&quot; &quot;$(ProjectDir)..\Common\src\svnrev_template.h&quot; &quot;$(ProjectDir)..\Common\src\svnrev.h&quot;"

-				ExcludedFromBuild="false"

+				ExcludedFromBuild="true"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

@@ -147,7 +147,7 @@
 			<Tool

 				Name="VCPreBuildEventTool"

 				CommandLine="&quot;$(ProjectDir)..\Common\SubWCRev.exe&quot; &quot;$(SolutionDir)\.&quot; &quot;$(ProjectDir)..\Common\src\svnrev_template.h&quot; &quot;$(ProjectDir)..\Common\src\svnrev.h&quot;"

-				ExcludedFromBuild="false"

+				ExcludedFromBuild="true"

 			/>

 			<Tool

 				Name="VCCustomBuildTool"

diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.cpp b/Source/Core/DolphinWX/Src/AboutDolphin.cpp
index 86ab39fd31..5166acc508 100644
--- a/Source/Core/DolphinWX/Src/AboutDolphin.cpp
+++ b/Source/Core/DolphinWX/Src/AboutDolphin.cpp
@@ -46,7 +46,7 @@ void AboutDolphin::CreateGUIControls()
 	DolphinLogo = new wxBitmap(iDolphinLogo);
 	sbDolphinLogo = new wxStaticBitmap(this, ID_LOGO, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0);
 	sbDolphinLogo->SetBitmap(*DolphinLogo);
-	std::string Text = std::string("Dolphin SVN revision ") +  SVN_REV_STR +"\n" "Copyright (c) 2003-2010+ Dolphin Team\n"
+	std::string Text = std::string("Dolphin ") +  SVN_REV_STR +"\n" "Copyright (c) 2003-2010+ Dolphin Team\n"
 		"Dolphin is a Gamecube/Wii emulator, which was originally written by F|RES and ector.\n" 
 		"Today Dolphin is an open source project with many contributors, too many to list.\n"
 		"If interested, just go check out the project page at http://code.google.com/p/dolphin-emu.\n\n"
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index a663b9e22a..8d622b617a 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -418,7 +418,7 @@ bool DolphinApp::OnInit()
 		#ifdef DEBUGFAST
 			const char *title = "Dolphin Debugfast SVN R " SVN_REV_STR;
 		#else
-			const char *title = "Dolphin SVN R " SVN_REV_STR;
+			const char *title = "Dolphin " SVN_REV_STR;
 		#endif
 	#endif
 
diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln
index d165e7e58c..60493fd8e6 100644
--- a/Source/Dolphin.sln
+++ b/Source/Dolphin.sln
@@ -59,6 +59,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\D
 		{823DDC98-42D5-4A38-88CF-9DC06C788AE4} = {823DDC98-42D5-4A38-88CF-9DC06C788AE4}

 		{3D8156A9-64D1-4C8E-ADBE-1B319030E4A4} = {3D8156A9-64D1-4C8E-ADBE-1B319030E4A4}

 		{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}

+		{66A4E7BD-E2E8-4373-9B75-8750EB5AE683} = {66A4E7BD-E2E8-4373-9B75-8750EB5AE683}

 		{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA} = {E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}

 		{29C2ABC1-ADA5-42CD-A5FC-96022D52A510} = {29C2ABC1-ADA5-42CD-A5FC-96022D52A510}

 		{4D3CD4C5-412B-4B49-9B1B-A68A2A129C77} = {4D3CD4C5-412B-4B49-9B1B-A68A2A129C77}

diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
index 9ffec68553..487221071e 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
@@ -173,7 +173,7 @@ unsigned int Callback_PeekMessages()
 void UpdateFPSDisplay(const char *text)
 {
 	char temp[512];
-	sprintf_s(temp, 512, "SVN R%i: DX9: %s", SVN_REV, text);
+	sprintf_s(temp, 512, "%s: DX9: %s", SVN_REV_STR, text);
     SetWindowTextA(EmuWindow::GetWnd(), temp);
 }
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
index 5bc174f851..522b98adb2 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
@@ -113,7 +113,7 @@ unsigned int Callback_PeekMessages()
 void UpdateFPSDisplay(const char *text)
 {
 	char temp[512];
-	sprintf(temp, "SVN R%s: GL: %s", SVN_REV_STR, text);
+	sprintf(temp, "%s: GL: %s", SVN_REV_STR, text);
 	OpenGL_SetWindowText(temp);
 }
 
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp
index 5523d2eba0..f268a5c7a4 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp
@@ -117,7 +117,7 @@ unsigned int Callback_PeekMessages()
 void UpdateFPSDisplay(const char *text)

 {

     char temp[512];

-    sprintf(temp, "SVN R%s: SW: %s", SVN_REV_STR, text);

+    sprintf(temp, "%s: SW: %s", SVN_REV_STR, text);

     OpenGL_SetWindowText(temp);

 }

 // =========================