diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2011-11-09 08:13:55 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2011-11-09 08:13:55 +0100 |
| commit | 56564023546e75b2c9f04fae8967d29de738a354 (patch) | |
| tree | 4401c625ad968100f5fb35ed90056b1065aa7f4d | |
| parent | 8bff1c519fc0047303486c99fbe30697df9b3c97 (diff) | |
| parent | e3a8e0c60b66b84d1c22fc012bd0d10d303a383d (diff) | |
| download | cgeo-56564023546e75b2c9f04fae8967d29de738a354.zip cgeo-56564023546e75b2c9f04fae8967d29de738a354.tar.gz cgeo-56564023546e75b2c9f04fae8967d29de738a354.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values/strings.xml
| -rw-r--r-- | main/AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | main/res/values/strings.xml | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml index e9b5380..58a4743 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="31.10.2011" - android:versionCode="20111031" + android:versionName="08.11.2011" + android:versionCode="20111108" package="cgeo.geocaching" name="c:geo" android:installLocation="auto"> @@ -307,4 +307,4 @@ <provider android:name="cgeo.geocaching.apps.LocusDataStorageProvider" android:authorities="cgeo.geocaching.apps.locusdatastorageprovider" /> </application> -</manifest>
\ No newline at end of file +</manifest> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index f58e21b..a693fa8 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -936,6 +936,9 @@ <!-- changelog --> <string name="changelog">\n <b>New release</b>\n +\n\n + <b>08.11.2011</b>\n + · fix: adaption to GC.com changes\n \n\n <b>31.10.2011</b>\n · fix: Store for offline from Live map\n |