Skip to content

Commit

Permalink
Bump version for 3.1.1 RC3
Browse files Browse the repository at this point in the history
  • Loading branch information
vexed committed Nov 24, 2013
1 parent 08ff1ab commit 816556d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AC_PREREQ([2.56])
AC_INIT([Warzone 2100],[3.1git],[http://wz2100.net/],[warzone2100])
AC_INIT([Warzone 2100],[3.1.1_rc3],[http://wz2100.net/],[warzone2100])

AM_INIT_AUTOMAKE([1.11 tar-ustar no-dist-gzip dist-xz])

Expand Down Expand Up @@ -257,7 +257,7 @@ AS_IF([test "x$enable_sound" != "xyes"],[
# Add later for stricter checking: -Wextra -Wmissing-declarations -Wstrict-prototypes
AC_ARG_ENABLE([debug],
AS_HELP_STRING([--enable-debug[=yes/relaxed/profile/debugprofile/optimised/no]],[Compile debug version [[yes]]]),
[ enable_debug=${enableval} ], [ enable_debug=yes ])
[ enable_debug=${enableval} ], [ enable_debug=no ])
AC_MSG_CHECKING([whether to compile in debug mode])
AC_MSG_RESULT([${enable_debug}])

Expand Down
2 changes: 1 addition & 1 deletion lib/netplay/netplay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ unsigned NET_PlayerConnectionStatus[CONNECTIONSTATUS_NORMAL][MAX_PLAYERS];
**/
static char const *versionString = version_getVersionString();
static int NETCODE_VERSION_MAJOR = 6;
static int NETCODE_VERSION_MINOR = 0x11;
static int NETCODE_VERSION_MINOR = 0x14;

bool NETisCorrectVersion(uint32_t game_version_major, uint32_t game_version_minor)
{
Expand Down
8 changes: 4 additions & 4 deletions win32/warzone2100.rc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
//

1 VERSIONINFO
FILEVERSION 3,1,0,0
PRODUCTVERSION 3,1,0,0
FILEVERSION 3,1,1,0
PRODUCTVERSION 3,1,1,0
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -22,12 +22,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Warzone 2100 Project"
VALUE "FileDescription", "Warzone 2100"
VALUE "FileVersion", "3.1git"
VALUE "FileVersion", "3.1.1 RC3"
VALUE "InternalName", "Warzone 2100"
VALUE "LegalCopyright", "Copyright � 2005-2013 Warzone 2100 Project"
VALUE "OriginalFilename", "warzone2100.exe"
VALUE "ProductName", "Warzone 2100"
VALUE "ProductVersion", "3.1git"
VALUE "ProductVersion", "3.1.1 RC3"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions win32/warzone2100_portable.rc
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
//

1 VERSIONINFO
FILEVERSION 9,9,9,9
PRODUCTVERSION 9,9,9,9
FILEVERSION 3,1,1,0
PRODUCTVERSION 3,1,1,0
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -22,12 +22,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Warzone 2100 Project"
VALUE "FileDescription", "Warzone 2100 portable"
VALUE "FileVersion", "master"
VALUE "FileVersion", "3.1.1 RC3"
VALUE "InternalName", "Warzone 2100"
VALUE "LegalCopyright", "Copyright � 2005-2013 Warzone 2100 Project"
VALUE "OriginalFilename", "warzone2100_portable.exe"
VALUE "ProductName", "Warzone 2100 portable"
VALUE "ProductVersion", "master"
VALUE "ProductVersion", "3.1.1 RC3"
END
END
BLOCK "VarFileInfo"
Expand Down

0 comments on commit 816556d

Please sign in to comment.