summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2015-02-18 19:50:37 +0200
committerBlockMen <nmuelll@web.de>2015-02-18 23:50:01 +0100
commite6ad2ace1072160adcf34a254add4447f935268c (patch)
treec0e2355900ea02e600a00de1282c845e19a4a05e
parent804d65a8ecdb70acf868e0a5a9b6c670b473a70c (diff)
downloadminetest-e6ad2ace1072160adcf34a254add4447f935268c.tar.gz
minetest-e6ad2ace1072160adcf34a254add4447f935268c.tar.bz2
minetest-e6ad2ace1072160adcf34a254add4447f935268c.zip
Bump version to 0.4.12
-rw-r--r--CMakeLists.txt4
-rw-r--r--build/android/Makefile2
-rw-r--r--doc/lua_api.txt2
-rw-r--r--doc/menu_lua_api.txt2
4 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c64b2e76..98d9aee0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,14 +12,14 @@ set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
# Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
set(VERSION_MAJOR 0)
set(VERSION_MINOR 4)
-set(VERSION_PATCH 11)
+set(VERSION_PATCH 12)
set(VERSION_PATCH_ORIG ${VERSION_PATCH})
if(VERSION_EXTRA)
set(VERSION_PATCH ${VERSION_PATCH}-${VERSION_EXTRA})
else()
# Comment the following line during release
- set(VERSION_PATCH ${VERSION_PATCH}-dev)
+ #set(VERSION_PATCH ${VERSION_PATCH}-dev)
endif()
set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
diff --git a/build/android/Makefile b/build/android/Makefile
index 68625b6a7..6027982ed 100644
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -26,7 +26,7 @@ GAMES_TO_COPY = minetest_game
# Android Version code
# Increase for each build!
################################################################################
-ANDROID_VERSION_CODE = 5
+ANDROID_VERSION_CODE = 6
################################################################################
# toolchain config for arm old processors
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index ba4eae35c..1e25fb812 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1,4 +1,4 @@
-Minetest Lua Modding API Reference 0.4.11
+Minetest Lua Modding API Reference 0.4.12
=========================================
* More information at <http://www.minetest.net/>
* Developer Wiki: <http://dev.minetest.net/>
diff --git a/doc/menu_lua_api.txt b/doc/menu_lua_api.txt
index f76124a0d..e5ba46d4c 100644
--- a/doc/menu_lua_api.txt
+++ b/doc/menu_lua_api.txt
@@ -1,4 +1,4 @@
-Minetest Lua Mainmenu API Reference 0.4.11
+Minetest Lua Mainmenu API Reference 0.4.12
========================================
Introduction