diff options
| author | keith.paterson <keith.paterson@saxsys.de> | 2011-09-24 20:52:34 +0200 |
|---|---|---|
| committer | keith.paterson <keith.paterson@saxsys.de> | 2011-09-24 20:52:34 +0200 |
| commit | 128d4fc4f98289ccd3ff09bc95ab2df06c5e310c (patch) | |
| tree | 145106ed541bafa22c9f482b55801374161d12ae /main | |
| parent | 5aa16ec417d9f5ef570bb9f0e033bc868131afbc (diff) | |
| parent | e2704a7ca16020ccfede22b144dbc152bd88c76c (diff) | |
| download | cgeo-128d4fc4f98289ccd3ff09bc95ab2df06c5e310c.zip cgeo-128d4fc4f98289ccd3ff09bc95ab2df06c5e310c.tar.gz cgeo-128d4fc4f98289ccd3ff09bc95ab2df06c5e310c.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into database-optimization
Diffstat (limited to 'main')
| -rw-r--r-- | main/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | main/res/values/strings.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/main/AndroidManifest.xml b/main/AndroidManifest.xml index bfb9b38..fd06764 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="18.09.2011" - android:versionCode="20110918" + android:versionName="24.09.2011" + android:versionCode="20110924" package="cgeo.geocaching" name="c:geo" android:installLocation="auto"> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index a7737d3..95e6376 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -950,7 +950,7 @@ <!-- changelog --> <string name="changelog">\n - <b>next version</b>\n + <b>24.09.2011</b>\n · new: import of LOC files\n · new: search for geo code supports OpenCaching.ORG.UK/.PL/.US\n · new: restore settings after reinstallation (Android 2.3+)\n |