aboutsummaryrefslogtreecommitdiffstats
path: root/main/res
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2013-10-24 18:13:11 +0200
committerBananeweizen <bananeweizen@gmx.de>2013-10-24 18:13:11 +0200
commit115ae0124bd995aefcd1286cd3bdbd64afd88412 (patch)
treeb33e9be706fd0b52d6df59a3cb8fe539a7ac25d2 /main/res
parent03c915c0b432f39cfacb3915bb077b40202ee0ab (diff)
parent6803fe2959d8e2bb13a2bfbe591c6be637fda2e7 (diff)
downloadcgeo-115ae0124bd995aefcd1286cd3bdbd64afd88412.zip
cgeo-115ae0124bd995aefcd1286cd3bdbd64afd88412.tar.gz
cgeo-115ae0124bd995aefcd1286cd3bdbd64afd88412.tar.bz2
Merge remote-tracking branch 'origin/release'
Conflicts: tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
Diffstat (limited to 'main/res')
-rw-r--r--main/res/values/changelog_release.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml
index fcb417b..9776247 100644
--- a/main/res/values/changelog_release.xml
+++ b/main/res/values/changelog_release.xml
@@ -2,6 +2,11 @@
<resources>
<!-- changelog for the release branch -->
<string name="changelog_release" translatable="false">\n
+ <b>2013.10.23</b>\n
+ · Adapted to changes on gc.com (spoiler images)\n
+ · Possibility to manually select file path for maps\n
+ \n
+ \n
<b>2013.09.19</b>\n
· Unscaled log picture now uploaded correctly\n
· GPS exhibit not recognized as event cache\n