Update files from TRUNK->master

Warzone2100 · Oct 31, 2010 · 5bbe90d · 5bbe90d
1 parent 33c2560
commit 5bbe90d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/autorevision.conf b/autorevision.conf
@@ -1 +1 @@
-wc_uri=trunk
+wc_uri=master
diff --git a/configure.ac b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.56])
-AC_INIT([Warzone 2100],[TRUNK],[http://wz2100.net/],[warzone2100])
+AC_INIT([Warzone 2100],[master],[http://wz2100.net/],[warzone2100])
 
 AM_INIT_AUTOMAKE([1.10 tar-ustar])
 

diff --git a/win32/warzone2100.rc b/win32/warzone2100.rc
@@ -20,14 +20,14 @@ BEGIN
 	BEGIN
 		BLOCK "040904b0"
 		BEGIN
-			VALUE "CompanyName", "Warzone Resurrection Project"
+			VALUE "CompanyName", "Warzone 2100 Project"
 			VALUE "FileDescription", "Warzone 2100"
-			VALUE "FileVersion", "TRUNK"
+			VALUE "FileVersion", "master"
 			VALUE "InternalName", "Warzone 2100"
-			VALUE "LegalCopyright", "Copyright � 2005-2009 Warzone Resurrection Project"
+			VALUE "LegalCopyright", "Copyright � 2005-2010 Warzone 2100 Project"
 			VALUE "OriginalFilename", "warzone2100.exe"
 			VALUE "ProductName", "Warzone 2100"
-			VALUE "ProductVersion", "TRUNK"
+			VALUE "ProductVersion", "master"
 		END
 	END
 	BLOCK "VarFileInfo"

diff --git a/win32/warzone2100.vs2k5.rc b/win32/warzone2100.vs2k5.rc
@@ -20,14 +20,14 @@ BEGIN
 	BEGIN
 		BLOCK "040904b0"
 		BEGIN
-			VALUE "CompanyName", "Warzone Resurrection Project"
+			VALUE "CompanyName", "Warzone 2100 Project"
 			VALUE "FileDescription", "Warzone 2100"
-			VALUE "FileVersion", "2.2.1"
+			VALUE "FileVersion", "master"
 			VALUE "InternalName", "Warzone 2100"
-			VALUE "LegalCopyright", "Copyright � 2005-2009 Warzone Resurrection Project"
+			VALUE "LegalCopyright", "Copyright � 2005-2010 Warzone 2100 Project"
 			VALUE "OriginalFilename", "warzone2100.exe"
 			VALUE "ProductName", "Warzone 2100"
-			VALUE "ProductVersion", "2.2.1"
+			VALUE "ProductVersion", "master"
 		END
 	END
 	BLOCK "VarFileInfo"

diff --git a/win32/warzone2100.vs2k8.rc b/win32/warzone2100.vs2k8.rc
@@ -20,14 +20,14 @@ BEGIN
 	BEGIN
 		BLOCK "040904b0"
 		BEGIN
-			VALUE "CompanyName", "Warzone Resurrection Project"
+			VALUE "CompanyName", "Warzone 2100 Project"
 			VALUE "FileDescription", "Warzone 2100"
-			VALUE "FileVersion", "TRUNK"
+			VALUE "FileVersion", "master"
 			VALUE "InternalName", "Warzone 2100"
-			VALUE "LegalCopyright", "Copyright � 2005-2009 Warzone Resurrection Project"
+			VALUE "LegalCopyright", "Copyright � 2005-2010 Warzone 2100 Project"
 			VALUE "OriginalFilename", "warzone2100.exe"
 			VALUE "ProductName", "Warzone 2100"
-			VALUE "ProductVersion", "TRUNK"
+			VALUE "ProductVersion", "master"
 		END
 	END
 	BLOCK "VarFileInfo"