Permalink
Browse files

Merge branch 'release/3.11.1'

  • Loading branch information...
filux committed Mar 8, 2015
2 parents 9d98d2e + 90c3071 commit 7f21f4cbbed3e9921d8d12e1c72df5de2f9c0d1c
@@ -5,6 +5,8 @@
# Written by Mark Vejvoda <mark_vejvoda@hotmail.com>
# Copyright (c) 2011-2015 Mark Vejvoda under GNU GPL v3.0+
CURRENTDIR="$(dirname "$(readlink -f "$0")")"
cd "$CURRENTDIR"
CURRENT_VERSION=`./mg-version.sh --version`
OLD_VERSION=`./mg-version.sh --oldversion_binary`
VERSION_INFO_FILE="$(dirname "$(readlink -f "$0")")/../../source/version.txt"
@@ -1,5 +1,5 @@
local GAME_INSTALL_SIZE = 680000000;
local GAME_VERSION = "3.12-dev";
local GAME_VERSION = "3.11.1";
local _ = MojoSetup.translate
@@ -4,7 +4,7 @@
!define APNAME MegaGlest
!define APNAME_OLD Mega-Glest
!define APVER_OLD 3.11.0
!define APVER 3.12-dev
!define APVER 3.11.1
Name "${APNAME} ${APVER}"
SetCompressor /FINAL /SOLID lzma
@@ -2,10 +2,10 @@
; General Attributes
!define APNAME MegaGlest
!define APVER 3.12-dev
!define APVER 3.11.1
!define APNAME_OLD Mega-Glest
!define APVER_OLD 3.11.0
!define APVER_UPDATE 3.12-dev
!define APVER_UPDATE 3.11.1
Name "${APNAME} ${APVER_UPDATE}"
SetCompressor /FINAL /SOLID lzma
@@ -58,7 +58,7 @@ const char *folderDelimiter = "/";
//int GameConstants::updateFps= 40;
//int GameConstants::cameraFps= 100;
const string g3dviewerVersionString= "v3.12-dev";
const string g3dviewerVersionString= "v3.11.1";
// Because g3d should always support alpha transparency
string fileFormat = "png";
@@ -32,7 +32,7 @@ const char *mailString = " http://bugs.megaglest.org";
// !! Use minor versions !! Only major and minor version control compatibility!
// typical version numbers look like this: v3.11-beta1.0 v3.12-dev v3.12.0
// don't forget to update mk/linux/mg-version.sh
const string glestVersionString = "v3.12-dev";
const string glestVersionString = "v3.11.1";
const string lastCompatibleSaveGameVersionString = "v3.9.0";
#if defined(GITVERSION)
@@ -43,7 +43,7 @@ const string lastCompatibleSaveGameVersionString = "v3.9.0";
const string GIT_RawRev = string(GITVERSION);
const string GIT_Rev = string("Rev: ") + string(GITVERSION);
#else
const string GIT_RawRev = "$5060.7451e49$";
const string GIT_RawRev = "$5088.9d98d2e$";
const string GIT_Rev = "$Rev$";
#endif
@@ -46,7 +46,7 @@ string getGameReadWritePath(string lookupKey) {
namespace MapEditor {
const string mapeditorVersionString = "v3.12-dev";
const string mapeditorVersionString = "v3.11.1";
const string MainWindow::winHeader = "MegaGlest Map Editor " + mapeditorVersionString;
// ===============================================
View
@@ -3,11 +3,11 @@
# Versions will be updated everywhere automatically.
# Then you should commit changed files and that's all.
CurrentGameVersion = "3.12-dev";
CurrentGameVersion = "3.11.1";
# ^ typical version numbers look like this: "3.11-beta1.0", "3.12-dev", "3.12.0"
OldReleaseGameVersion = "3.11.0";
LastCompatibleSaveGameVersion = "3.9.0";
GitCommitForRelease = "5060.7451e49";
GitCommitForRelease = "5088.9d98d2e";
# ^ will be automatically generated

0 comments on commit 7f21f4c

Please sign in to comment.