From 0ce3784210b60c2058ee22eb6af63869e20b3aff Mon Sep 17 00:00:00 2001 From: pelya Date: Sat, 23 Feb 2013 13:58:43 +0200 Subject: [PATCH] Cleaned up .gitignore --- .gitignore | 1 + changeAppSettings.sh | 1 + project/jni/application/commandergenius/commandergenius | 2 +- project/res/drawable-xhdpi/.gitignore | 1 - 4 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 project/res/drawable-xhdpi/.gitignore diff --git a/.gitignore b/.gitignore index 7be49a15c..fd40df575 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ project/AndroidManifest.xml project/jni/Settings.mk project/jni/application/*/libapplication*.so project/jni/application/src +project/res/drawable-xhdpi/ouya_icon.png \ No newline at end of file diff --git a/changeAppSettings.sh b/changeAppSettings.sh index bd4ff3c8d..2de5b9c7d 100755 --- a/changeAppSettings.sh +++ b/changeAppSettings.sh @@ -1099,6 +1099,7 @@ rm -rf project/bin/classes rm -rf project/bin/res if which convert > /dev/null; then + mkdir -p project/res/drawable-xhdpi convert project/res/drawable/ouya_icon.png -resize '732x412!' project/res/drawable-xhdpi/ouya_icon.png else echo "Install ImageMagick to auto-resize Ouya icon from icon.png" diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index d03ad81c4..6f28771d5 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit d03ad81c489e7d6562818a96bbbb409ad9b044a7 +Subproject commit 6f28771d57ca7d878e3cfee08014651b854b9c7f diff --git a/project/res/drawable-xhdpi/.gitignore b/project/res/drawable-xhdpi/.gitignore deleted file mode 100644 index a7fa27a93..000000000 --- a/project/res/drawable-xhdpi/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ouya_icon.png