OttoLidenbrock d649afa044 Merge upstream ...

Conflicts:
	builtin/mainmenu/tab_simple_main.lua
	src/client/clientlauncher.cpp
	src/game.cpp
	src/guiEngine.cpp

2015-04-29 19:59:54 +10:00

..

jni

Tests: Modularize unit testing

2015-04-26 15:08:54 -04:00

res

Add support for Android 2.3+

2014-06-29 18:17:56 +02:00

src/net/minetest/minetest

Android: Backport changes from stable-0.4

2015-03-14 19:59:14 +01:00

AndroidManifest.xml.template

Fix package name in AndroidManifest.xml

2015-03-14 18:41:36 +01:00

build.xml

Add support for Android 2.3+

2014-06-29 18:17:56 +02:00

irrlicht-back_button.patch

Add support for Android 2.3+

2014-06-29 18:17:56 +02:00

irrlicht-texturehack.patch

Add support for Android 2.3+

2014-06-29 18:17:56 +02:00

irrlicht-touchcount.patch

Add support for Android 2.3+

2014-06-29 18:17:56 +02:00

libvorbis-libogg-fpu.patch

Add support for Android 2.3+

2014-06-29 18:17:56 +02:00

Makefile

Change project name and version (not android yet)

2015-04-27 00:54:48 +10:00

openssl_arch.patch

Switch to official openssl version and update to 1.0.1j

2015-01-04 16:57:19 +01:00

project.properties

Add support for Android 2.3+

2014-06-29 18:17:56 +02:00