diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-02-04 16:02:15 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-02-04 16:02:15 +0100 |
| commit | 7349583c4a615a7637c99086d470c832aa261124 (patch) | |
| tree | 83e5bf8b38584e33d4dc6cb8a526a96076cb845f /main/res | |
| parent | 7486f0687918d4ab860ebeff91f7831b140a6fc2 (diff) | |
| parent | 9f0aeedeeb57e2d8ace5e3e20fc49fda357e57ff (diff) | |
| download | cgeo-7349583c4a615a7637c99086d470c832aa261124.zip cgeo-7349583c4a615a7637c99086d470c832aa261124.tar.gz cgeo-7349583c4a615a7637c99086d470c832aa261124.tar.bz2 | |
Merge branch 'release' into upstream
Diffstat (limited to 'main/res')
| -rw-r--r-- | main/res/values/changelog_release.xml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml index 5da7314..d90a54b 100644 --- a/main/res/values/changelog_release.xml +++ b/main/res/values/changelog_release.xml @@ -2,10 +2,13 @@ <resources> <!-- changelog for the release branch --> <string name="changelog_release" translatable="false">\n - <b>Next bugfix release</b>\n - <b>Bugfixes:</b>\n + <b>Next bugfix release:</b>\n · …\n \n + <b>2014.02.04:</b>\n + · Reinstate parsing of trackable name and owner after gc.com change\n + · Minor stability fix\n + \n <b>2014.01.25</b>\n <b>Bugfixes:</b>\n · Twitter problem fixed\n |