From 79bd16bce74b6cf030253a64bc9a588c10791f0d Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Thu, 18 Oct 2012 18:42:37 +0300
Subject: [PATCH] Renamed TeeWorlds project dir, rebased my changes to 0.6
 branch

---
 .gitmodules                                         |   4 ++--
 project/jni/application/teeworlds-0.7/src           |   1 -
 .../AndroidAppSettings.cfg                          |   4 ++--
 .../{teeworlds-0.7 => teeworlds}/AndroidPreBuild.sh |   0
 .../{teeworlds-0.7 => teeworlds}/icon.png           | Bin
 5 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 160000 project/jni/application/teeworlds-0.7/src
 rename project/jni/application/{teeworlds-0.7 => teeworlds}/AndroidAppSettings.cfg (97%)
 rename project/jni/application/{teeworlds-0.7 => teeworlds}/AndroidPreBuild.sh (100%)
 rename project/jni/application/{teeworlds-0.7 => teeworlds}/icon.png (100%)

diff --git a/.gitmodules b/.gitmodules
index 854e7b47d..ec5df34a4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,6 +28,6 @@
 [submodule "project/jni/application/openarena/vm"]
 	path = project/jni/application/openarena/vm
 	url = https://github.com/pelya/openarena-vm
-[submodule "project/jni/application/teeworlds-0.7/src"]
-	path = project/jni/application/teeworlds-0.7/src
+[submodule "project/jni/application/teeworlds/src"]
+	path = project/jni/application/teeworlds/src
 	url = git://github.com/pelya/teeworlds.git
diff --git a/project/jni/application/teeworlds-0.7/src b/project/jni/application/teeworlds-0.7/src
deleted file mode 160000
index 16c193eec..000000000
--- a/project/jni/application/teeworlds-0.7/src
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 16c193eec2b9a840e6782f8dc26a53bc6a182a56
diff --git a/project/jni/application/teeworlds-0.7/AndroidAppSettings.cfg b/project/jni/application/teeworlds/AndroidAppSettings.cfg
similarity index 97%
rename from project/jni/application/teeworlds-0.7/AndroidAppSettings.cfg
rename to project/jni/application/teeworlds/AndroidAppSettings.cfg
index 44b2b93c5..c3c9a64d4 100644
--- a/project/jni/application/teeworlds-0.7/AndroidAppSettings.cfg
+++ b/project/jni/application/teeworlds/AndroidAppSettings.cfg
@@ -34,8 +34,8 @@ StartupMenuButtonTimeout=3000
 HiddenMenuOptions='OptionalDownloadConfig DisplaySizeConfig'
 FirstStartMenuOptions=''
 MultiABI=n
-AppVersionCode=07008
-AppVersionName="0.7.0.08"
+AppVersionCode=06108
+AppVersionName="0.6.1.08"
 ResetSdlConfigForThisVersion=y
 DeleteFilesOnUpgrade="data"
 CompiledLibraries="sdl_image freetype glu"
diff --git a/project/jni/application/teeworlds-0.7/AndroidPreBuild.sh b/project/jni/application/teeworlds/AndroidPreBuild.sh
similarity index 100%
rename from project/jni/application/teeworlds-0.7/AndroidPreBuild.sh
rename to project/jni/application/teeworlds/AndroidPreBuild.sh
diff --git a/project/jni/application/teeworlds-0.7/icon.png b/project/jni/application/teeworlds/icon.png
similarity index 100%
rename from project/jni/application/teeworlds-0.7/icon.png
rename to project/jni/application/teeworlds/icon.png