Bump version number to 2.1.0.

7 files changed, 24 insertions, 21 deletions

diff --git a/NEWS b/NEWS
index da799ed4..8ad2d302 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 
-2.1.0 (2014-??-??):
+2.1.0 (2014-10-22):
 
     Chocolate Doom now supports high-quality substitute music packs
     that are used in place of the original MIDI music tracks. I'm
@@ -51,6 +51,9 @@
        error to show the error message (thanks Willy Barro).
      * There are now Linux .desktop files for all supported games
        (thanks Mike Swanson).
+     * The -geometry command line parameter can now be used to specify
+       fullscreen or windowed modes, eg. -geometry 640x480w or
+       -geometry 1024x768f. (thanks Mike Swanson)
 
     Doom:
      * Minor workarounds were added to allow the BFG Edition IWADs to
diff --git a/codeblocks/config.h b/codeblocks/config.h
index f25d4cd6..3d1dc86d 100644
--- a/codeblocks/config.h
+++ b/codeblocks/config.h
@@ -9,13 +9,13 @@
 #define PACKAGE_NAME "Chocolate Doom"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Chocolate Doom 2.0.0"
+#define PACKAGE_STRING "Chocolate Doom 2.1.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "chocolate-doom"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.0.0"
+#define PACKAGE_VERSION "2.1.0"
 
 /* Change this when you create your awesome forked version */
 #define PROGRAM_PREFIX "chocolate-"
@@ -24,7 +24,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "2.0.0"
+#define VERSION "2.1.0"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
diff --git a/codeblocks/game-res.rc b/codeblocks/game-res.rc
index ee16aaef..298d702c 100644
--- a/codeblocks/game-res.rc
+++ b/codeblocks/game-res.rc
@@ -1,21 +1,21 @@
 1 ICON "../data/doom.ico"
 
 1 VERSIONINFO
-PRODUCTVERSION 2,0,0,0
-FILEVERSION 2,0,0,0
+PRODUCTVERSION 2,1,0,0
+FILEVERSION 2,1,0,0
 FILETYPE 1
 {
  BLOCK "StringFileInfo"
  {
   BLOCK "040904E4"
   {
-   VALUE "FileVersion", "2.0.0"
-   VALUE "FileDescription", "2.0.0"
+   VALUE "FileVersion", "2.1.0"
+   VALUE "FileDescription", "2.1.0"
    VALUE "InternalName", "Chocolate Doom"
    VALUE "CompanyName", "Chocolate Doom"
    VALUE "LegalCopyright", "GNU General Public License"
    VALUE "ProductName", "Chocolate Doom"
-   VALUE "ProductVersion", "2.0.0"
+   VALUE "ProductVersion", "2.1.0"
   }
  }
  BLOCK "VarFileInfo"
diff --git a/codeblocks/setup-res.rc b/codeblocks/setup-res.rc
index e78910a1..c52883cf 100644
--- a/codeblocks/setup-res.rc
+++ b/codeblocks/setup-res.rc
@@ -1,21 +1,21 @@
 1 ICON "../data/setup.ico"
 
 1 VERSIONINFO
-PRODUCTVERSION 2,0,0,0
-FILEVERSION 2,0,0,0
+PRODUCTVERSION 2,1,0,0
+FILEVERSION 2,1,0,0
 FILETYPE 1
 {
  BLOCK "StringFileInfo"
  {
   BLOCK "040904E4"
   {
-   VALUE "FileVersion", "2.0.0"
+   VALUE "FileVersion", "2.1.0"
    VALUE "FileDescription", "Chocolate Doom Setup"
    VALUE "InternalName", "chocolate-setup"
    VALUE "CompanyName", "Chocolate Doom"
    VALUE "LegalCopyright", "GNU General Public License"
    VALUE "ProductName", "Chocolate Doom Setup"
-   VALUE "ProductVersion", "2.0.0"
+   VALUE "ProductVersion", "2.1.0"
   }
  }
  BLOCK "VarFileInfo"
diff --git a/configure.ac b/configure.ac
index fcefdc60..8aef46fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(Chocolate Doom, 2.0.0, fraggle@gmail.com, chocolate-doom)
+AC_INIT(Chocolate Doom, 2.1.0, fraggle@gmail.com, chocolate-doom)
 
 PACKAGE_SHORTNAME=${PACKAGE_NAME% Doom}
 PACKAGE_SHORTDESC="Conservative source port"
diff --git a/msvc/config.h b/msvc/config.h
index 5a2ccdbd..d153eacb 100644
--- a/msvc/config.h
+++ b/msvc/config.h
@@ -11,19 +11,19 @@
 #define PACKAGE_NAME "Chocolate Doom"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Chocolate Doom 2.0.0"
+#define PACKAGE_STRING "Chocolate Doom 2.1.0"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "chocolate-doom"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.0.0"
+#define PACKAGE_VERSION "2.1.0"
 
 /* Change this when you create your awesome forked version */
 #define PROGRAM_PREFIX "chocolate-"
 
 /* Version number of package */
-#define VERSION "2.0.0"
+#define VERSION "2.1.0"
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
diff --git a/msvc/win32.rc b/msvc/win32.rc
index 3cd28c04..452bf21c 100644
--- a/msvc/win32.rc
+++ b/msvc/win32.rc
@@ -25,8 +25,8 @@
 #endif

 

 1 VERSIONINFO

-PRODUCTVERSION 2,0,0,0

-FILEVERSION 2,0,0,0

+PRODUCTVERSION 2,1,0,0

+FILEVERSION 2,1,0,0

 FILETYPE 1

 BEGIN

 	BLOCK "StringFileInfo"

@@ -34,12 +34,12 @@ BEGIN
 		BLOCK "040904E4"

 		BEGIN

 			VALUE "FileVersion", "1.0.0"

-			VALUE "FileDescription", "Chocolate Doom 2.0.0"

+			VALUE "FileDescription", "Chocolate Doom 2.1.0"

 			VALUE "InternalName", "chocolate-doom"

 			VALUE "CompanyName", "fraggle@gmail.com"

 			VALUE "LegalCopyright", "GNU General Public License"

 			VALUE "ProductName", "Chocolate Doom"

-			VALUE "ProductVersion", "2.0.0"

+			VALUE "ProductVersion", "2.1.0"

 		END

 	END

 	BLOCK "VarFileInfo"