Create final 1.1 branch

2020-01-04 02:47:06 +08:00
4 changed files with 7 additions and 7 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.4)
 # root CMakeLists for the SuperTuxKart project
 project(SuperTuxKart)
-set(PROJECT_VERSION "git")
+set(PROJECT_VERSION "1.1")
 add_definitions( -DSUPERTUXKART_VERSION="${PROJECT_VERSION}" )
 if(NOT (CMAKE_MAJOR_VERSION VERSION_LESS 3))
--- a/data/supertuxkart.1.1
+++ b/data/supertuxkart.1.1
--- a/tools/windows_installer/supertuxkart-64bit-mingw.nsi
+++ b/tools/windows_installer/supertuxkart-64bit-mingw.nsi
@@ -29,11 +29,11 @@
  ; Version information
  ; TOOD get these from the source code directly
-  !define VERSION_MAJOR 0
+  !define VERSION_MAJOR 1
-  !define VERSION_MINOR 10
+  !define VERSION_MINOR 1
  !define VERSION_REVISION 0
  ; Empty means stable, could be -git, -rc1
-  !define VERSION_BUILD "-git"
+  !define VERSION_BUILD ""
  ;Name and file
  !define APPNAME "SuperTuxKart"
--- a/tools/windows_installer/supertuxkart-mingw.nsi
+++ b/tools/windows_installer/supertuxkart-mingw.nsi
@@ -29,11 +29,11 @@
  ; Version information
  ; TOOD get these from the source code directly
-  !define VERSION_MAJOR 0
+  !define VERSION_MAJOR 1
-  !define VERSION_MINOR 10
+  !define VERSION_MINOR 1
  !define VERSION_REVISION 0
  ; Empty means stable, could be -git, -rc1
-  !define VERSION_BUILD "-git"
+  !define VERSION_BUILD ""
  ;Name and file
  !define APPNAME "SuperTuxKart"