diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-04-25 08:44:29 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-04-25 08:44:29 +0200 |
| commit | 4d63e288e2143ec61e3b38adee0f6dd662f989a0 (patch) | |
| tree | 30f9da82730a04c6c17e9389d60743648ab96217 /main | |
| parent | 983133b0d9fe008a3f74a592a43f91b133db03e7 (diff) | |
| parent | eb7631ce260a42fb736868f8d45bde60311c750c (diff) | |
| download | cgeo-4d63e288e2143ec61e3b38adee0f6dd662f989a0.zip cgeo-4d63e288e2143ec61e3b38adee0f6dd662f989a0.tar.gz cgeo-4d63e288e2143ec61e3b38adee0f6dd662f989a0.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values/strings.xml
tests/src/cgeo/geocaching/connector/gc/GCParserTest.java
Diffstat (limited to 'main')
| -rw-r--r-- | main/AndroidManifest.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml index b9a8c2b..d8fc6f3 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="02.04.2012" - android:versionCode="20120402" + android:versionName="24.04.2012" + android:versionCode="20120424" package="cgeo.geocaching" name="c:geo" android:installLocation="auto"> |