diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-12-10 15:19:22 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-12-10 15:19:22 +0100 |
| commit | 4018d7abe44d904a09facadacd7a8fa8e3b91dd6 (patch) | |
| tree | 8c98d41cee821fd67235dec54beb18ab92b707bc | |
| parent | a0f379adc1b96cc47d25db0a223d4975a4f743ce (diff) | |
| parent | 4e429cdbc19145c5435bbbd85e1c2acd4e44fada (diff) | |
| download | cgeo-4018d7abe44d904a09facadacd7a8fa8e3b91dd6.zip cgeo-4018d7abe44d904a09facadacd7a8fa8e3b91dd6.tar.gz cgeo-4018d7abe44d904a09facadacd7a8fa8e3b91dd6.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values/strings.xml
| -rw-r--r-- | main/AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml index 0b03f90..3594510 100644 --- a/main/AndroidManifest.xml +++ b/main/AndroidManifest.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="developer build" - android:versionCode="20120618" + android:versionCode="20121203" package="cgeo.geocaching" android:installLocation="auto"> <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="13" /> |