From 98f3642373e244eeadaf5f617fde87b06b779146 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Sat, 28 May 2016 01:50:57 +0300
Subject: [PATCH] Updated .gitignore

---
 .gitignore                                | 40 +++++++++++------------
 project/java/Settings.java                |  1 +
 project/jni/application/supertux/supertux |  2 +-
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0fca9380d..5bc39b821 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,20 @@
-project/local.properties
-project/bin
-project/gen
-project/lib
-project/libs
-project/assets
-project/obj
-project/src
-project/res/values*/strings.xml
-project/AndroidManifest.xml
-project/jni/Settings.mk
-project/jni/application/*/libapplication*.so
-project/jni/application/src
-project/res/drawable-xhdpi/ouya_icon.png
-project/res/drawable/app_icon.png
-project/proguard-project.txt
-project/proguard-local.cfg
-project/themes/converter
-project/jni/android-support
-project/res/drawable/banner.png
+/project/local.properties
+/project/bin
+/project/gen
+/project/lib
+/project/libs
+/project/assets
+/project/obj
+/project/src
+/project/res/values*/strings.xml
+/project/AndroidManifest.xml
+/project/jni/Settings.mk
+/project/jni/application/*/libapplication*.so
+/project/jni/application/src
+/project/res/drawable-xhdpi/ouya_icon.png
+/project/res/drawable/app_icon.png
+/project/proguard-project.txt
+/project/proguard-local.cfg
+/project/themes/converter
+/project/jni/android-support
+/project/res/drawable/banner.png
diff --git a/project/java/Settings.java b/project/java/Settings.java
index d72649e9d..5a9d2c1a4 100644
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -446,6 +446,7 @@ class Settings
 					new File(Globals.DataDir).mkdirs();
 					new FileOutputStream( new File(Globals.DataDir, ".nomedia") ).close();
 				} catch (Exception e) {
+					Log.i("SDL", "libSDL: cannot create .nomedia file at " + Globals.DataDir + " - switching to internal storage");
 					Globals.DownloadToSdcard = false; // SD card not writable
 					Globals.DataDir = p.getFilesDir().getAbsolutePath();
 				}
diff --git a/project/jni/application/supertux/supertux b/project/jni/application/supertux/supertux
index 409394183..2df4eb57b 160000
--- a/project/jni/application/supertux/supertux
+++ b/project/jni/application/supertux/supertux
@@ -1 +1 @@
-Subproject commit 409394183506b4b42517ee51ec5c1d415cf38669
+Subproject commit 2df4eb57ba72681025c615c21cf003935426d4fb