Bump version to 0.4.12

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c64b2e767c3eff32c71eb06f04631cca7a9d5b7..98d9aee0f06a2b19d5067bab5019f050b6e51d1f 100644 (file)
--- 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 68625b6a7cc026cdff974836e272206fec3bc8f4..6027982ed7483615372ff7370aa5b63539c62670 100644 (file)
--- 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 586c520fc0774de0e8689c173e06d0b562bfca3c..d2d885880a17496dd99a428ef79a6441ed515ac6 100644 (file)
--- 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 f76124a0d5bbf1d73f30f7b60c628e9c4064e748..e5ba46d4c0998e63eb259c59a757256682d8b262 100644 (file)
--- 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