diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-06-06 22:11:20 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-06-06 22:11:20 +0200 |
| commit | 31f7127ea0fc94e559e7d5179bf5fc5d74a14853 (patch) | |
| tree | 4b3a5196ba0293a8b02c9f4175e96e7d237a1be0 | |
| parent | 11753b586661d7333ce4e92c8b6c82b1bfd89554 (diff) | |
| parent | cff0d4bbd77cfdeb4fb68da2a2010241bd2192ec (diff) | |
| download | cgeo-31f7127ea0fc94e559e7d5179bf5fc5d74a14853.zip cgeo-31f7127ea0fc94e559e7d5179bf5fc5d74a14853.tar.gz cgeo-31f7127ea0fc94e559e7d5179bf5fc5d74a14853.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values/strings.xml
| -rw-r--r-- | main/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | main/res/values/strings.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml index c95b668..0a7be1b 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="20120601" + android:versionCode="20120606" package="cgeo.geocaching" name="c:geo" android:installLocation="auto"> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 08ab1ff..e5dd8d8 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -1078,6 +1078,7 @@ Be aware: If navigation is started directly from live map it may also use the approximated coords!\n In fast mode the cache type might be wrong in rare cases\n Fast mode only detectes Tradi, Multi, Mystery, Event caches\n + On low zoom owned/found caches may not be hidden anymore\n ยท Other:\n Log images with huge size cause a long loading time\n\n\n <b>Old releases</b>\n |