diff --git a/project/java/Settings.java b/project/java/Settings.java index ee0b79aa6..98be7065e 100644 --- a/project/java/Settings.java +++ b/project/java/Settings.java @@ -2626,7 +2626,7 @@ class Settings settingsChanged = true; AlertDialog.Builder builder = new AlertDialog.Builder(p); builder.setTitle(R.string.not_enough_ram); - builder.setMessage(p.getResources().getString( R.string.not_enough_ram_size, (int)(size / 1024), Globals.AppMinimumRAM) ); + builder.setMessage(p.getResources().getString( R.string.not_enough_ram_size, Globals.AppMinimumRAM, (int)(size / 1024)) ); builder.setPositiveButton(p.getResources().getString(R.string.ok), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int item) diff --git a/project/jni/application/openarena/.gitignore b/project/jni/application/openarena/.gitignore index b52e154fa..2b9c44317 100644 --- a/project/jni/application/openarena/.gitignore +++ b/project/jni/application/openarena/.gitignore @@ -1 +1,2 @@ AndroidData +*.so diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index c98bcf9ee..687cdf8ab 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit c98bcf9eea63c3d875b55a0ca922a44b0a2ac0c8 +Subproject commit 687cdf8ab7e312bac6f5a9d77e31095c050b8a34 diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm index 8ffdaa479..dc740d594 160000 --- a/project/jni/application/openarena/vm +++ b/project/jni/application/openarena/vm @@ -1 +1 @@ -Subproject commit 8ffdaa479dd5b9d1a86057c84801daac1ca412dd +Subproject commit dc740d594f429924d82815b08b68f449a5a233a6 diff --git a/project/jni/application/ufoai/.gitignore b/project/jni/application/ufoai/.gitignore new file mode 100644 index 000000000..0f70023cd --- /dev/null +++ b/project/jni/application/ufoai/.gitignore @@ -0,0 +1 @@ +AndroidData/1android.pk3