summaryrefslogtreecommitdiff
path: root/codeblocks
diff options
context:
space:
mode:
authorSimon Howard2011-02-12 15:38:08 +0000
committerSimon Howard2011-02-12 15:38:08 +0000
commita9996b41e954d85fde5ec5188bbf6a7f4df88011 (patch)
tree113669ff889c9184aaa28224317c8b04c2c5bfeb /codeblocks
parent7d7b5087d2288fc6e2493448968f7d786043b389 (diff)
parenta366f68b2959282b22ab6f08569a253f0540745c (diff)
downloadchocolate-doom-a9996b41e954d85fde5ec5188bbf6a7f4df88011.tar.gz
chocolate-doom-a9996b41e954d85fde5ec5188bbf6a7f4df88011.tar.bz2
chocolate-doom-a9996b41e954d85fde5ec5188bbf6a7f4df88011.zip
Merge from trunk.
Subversion-branch: /branches/raven-branch Subversion-revision: 2258
Diffstat (limited to 'codeblocks')
-rw-r--r--codeblocks/config.h6
-rw-r--r--codeblocks/game-res.rc10
-rw-r--r--codeblocks/setup-res.rc8
3 files changed, 12 insertions, 12 deletions
diff --git a/codeblocks/config.h b/codeblocks/config.h
index d092bf73..9026d398 100644
--- a/codeblocks/config.h
+++ b/codeblocks/config.h
@@ -9,19 +9,19 @@
#define PACKAGE_NAME "Chocolate Doom"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Chocolate Doom 1.4.0"
+#define PACKAGE_STRING "Chocolate Doom 1.5.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 "1.4.0"
+#define PACKAGE_VERSION "1.5.0"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "1.4.0"
+#define VERSION "1.5.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 eef24852..beef1242 100644
--- a/codeblocks/game-res.rc
+++ b/codeblocks/game-res.rc
@@ -1,21 +1,21 @@
1 ICON "../data/doom.ico"
1 VERSIONINFO
-PRODUCTVERSION 1,4,0,0
-FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,5,0,0
+FILEVERSION 1,5,0,0
FILETYPE 1
{
BLOCK "StringFileInfo"
{
BLOCK "040904E4"
{
- VALUE "FileVersion", "1.4.0"
- VALUE "FileDescription", "1.4.0"
+ VALUE "FileVersion", "1.5.0"
+ VALUE "FileDescription", "1.5.0"
VALUE "InternalName", "Chocolate-Doom"
VALUE "CompanyName", "Chocolate-Doom"
VALUE "LegalCopyright", "GNU General Public License"
VALUE "ProductName", "Chocolate-Doom"
- VALUE "ProductVersion", "1.4.0"
+ VALUE "ProductVersion", "1.5.0"
}
}
}
diff --git a/codeblocks/setup-res.rc b/codeblocks/setup-res.rc
index f1602adb..b3812a74 100644
--- a/codeblocks/setup-res.rc
+++ b/codeblocks/setup-res.rc
@@ -3,21 +3,21 @@
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "setup-manifest.xml"
1 VERSIONINFO
-PRODUCTVERSION 1,4,0,0
-FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,5,0,0
+FILEVERSION 1,5,0,0
FILETYPE 1
{
BLOCK "StringFileInfo"
{
BLOCK "040904E4"
{
- VALUE "FileVersion", "1.4.0"
+ VALUE "FileVersion", "1.5.0"
VALUE "FileDescription", "Chocolate-Doom Setup"
VALUE "InternalName", "chocolate-setup"
VALUE "CompanyName", "fraggle@gmail.com"
VALUE "LegalCopyright", "GNU General Public License"
VALUE "ProductName", "Chocolate-Doom Setup"
- VALUE "ProductVersion", "1.4.0"
+ VALUE "ProductVersion", "1.5.0"
}
}
}