# HG changeset patch
# User Xeli
# Date 1319819618 -7200
# Node ID 3106add9a5bfffcefc4c716ae8fbc28050276d98
# Parent  42b256eca3627a2fc5e21edccc29f38fe577eabb# Parent  3f8ba061775ebabdc797e12999ae86e74b403633
merge

diff -r 42b256eca362 -r 3106add9a5bf project_files/Android-build/SDL-android-project/AndroidManifest.xml
--- a/project_files/Android-build/SDL-android-project/AndroidManifest.xml	Fri Oct 28 18:26:17 2011 +0200
+++ b/project_files/Android-build/SDL-android-project/AndroidManifest.xml	Fri Oct 28 18:33:38 2011 +0200
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.hedgewars.hedgeroid"
-      android:versionCode="3"
-      android:installLocation="preferExternal" android:versionName="0.1.10">
+      android:versionCode="4"
+      android:installLocation="preferExternal" android:versionName="0.1.11">
     <uses-sdk android:targetSdkVersion="8" android:minSdkVersion="7"></uses-sdk>
     <uses-permission android:name="android.permission.INTERNET"></uses-permission>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>