diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2014-05-14 19:43:51 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2014-05-14 19:43:51 +0200 |
| commit | f1ce7876f01fceed22b51e1576b75042daf8d18c (patch) | |
| tree | 814234b511d537ecacab9921748862423e5522a9 /main/res | |
| parent | 3188a7ef866dff3c08c1c2e45c5e87d295461326 (diff) | |
| parent | 6089f9db35f16797bde5f59c2bcda1d0803cfec6 (diff) | |
| download | cgeo-f1ce7876f01fceed22b51e1576b75042daf8d18c.zip cgeo-f1ce7876f01fceed22b51e1576b75042daf8d18c.tar.gz cgeo-f1ce7876f01fceed22b51e1576b75042daf8d18c.tar.bz2 | |
Merge remote-tracking branch 'origin/release'
Conflicts:
main/res/values/changelog_release.xml
Diffstat (limited to 'main/res')
| -rw-r--r-- | main/res/values/changelog_release.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml index 45d522b..86863cf 100644 --- a/main/res/values/changelog_release.xml +++ b/main/res/values/changelog_release.xml @@ -2,7 +2,7 @@ <resources> <!-- changelog for the release branch --> <string name="changelog_release" translatable="false">\n - <b>2013.05.14:</b>\n + <b>2014.05.14:</b>\n ยท Fix: Adapting to changes on geocaching.com\n \n <b>2014.04.30:</b>\n |