diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2015-01-05 15:03:01 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2015-01-05 15:03:01 +0100 |
| commit | 785d67a5c07d5372b3720131226a42a6fd24007c (patch) | |
| tree | ce4700ad3866bcf98adc9341c62a09bd9d98f01b | |
| parent | 49c8e375f28bf9dc735d0d31f081ea68fa0424fa (diff) | |
| download | cgeo-785d67a5c07d5372b3720131226a42a6fd24007c.zip cgeo-785d67a5c07d5372b3720131226a42a6fd24007c.tar.gz cgeo-785d67a5c07d5372b3720131226a42a6fd24007c.tar.bz2 | |
Merge changelogs
| -rw-r--r-- | main/res/values/changelog_master.xml | 6 | ||||
| -rw-r--r-- | main/res/values/changelog_release.xml | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/main/res/values/changelog_master.xml b/main/res/values/changelog_master.xml index fabd693..1e3c3d4 100644 --- a/main/res/values/changelog_master.xml +++ b/main/res/values/changelog_master.xml @@ -2,11 +2,5 @@ <resources> <!-- changelog for the master branch --> <string name="changelog_master" translatable="false"> - <b>Next feature release:</b>\n - · New: Waypoints created from personal notes can now be deleted\n - · New: More easy to use vote dialog in cache details\n - · Fix: Up navigation did not work when c:geo was invoked from another app\n - · Fix: Rare crash when performing a backup of the cache database\n - \n </string> </resources> diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml index b4f2e2d..8954cf6 100644 --- a/main/res/values/changelog_release.xml +++ b/main/res/values/changelog_release.xml @@ -2,7 +2,11 @@ <resources> <!-- changelog for the release branch --> <string name="changelog_release" translatable="false">\n - <b>Next bugfix release:</b>\n + <b>Next release:</b>\n + · New: Waypoints created from personal notes can now be deleted\n + · New: More easy to use vote dialog in cache details\n + · Fix: Up navigation did not work when c:geo was invoked from another app\n + · Fix: Rare crash when performing a backup of the cache database\n · Fix: Use phone language instead of country when requesting opencaching data\n · Fix: Menu for scanning trackable and geocache codes wrongly hidden\n · Fix: Recognize Sygic voucher edition\n |