diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2012-12-17 15:58:09 +0100 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2012-12-17 15:58:09 +0100 |
| commit | 5e3b688891cf3f34237604d861933bd91e5da650 (patch) | |
| tree | 4e047092a6da17a09c66739d8c6650e3f39c5907 /main/src | |
| parent | 6191b4e2aa3b1dea8dd8a41f5396d5e069662f3f (diff) | |
| parent | fb507c2138f1f68e8b48779058967b077ac1e1f9 (diff) | |
| download | cgeo-5e3b688891cf3f34237604d861933bd91e5da650.zip cgeo-5e3b688891cf3f34237604d861933bd91e5da650.tar.gz cgeo-5e3b688891cf3f34237604d861933bd91e5da650.tar.bz2 | |
Merge branch 'release' into upstream
Conflicts:
main/res/values/strings.xml
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/cgeo/geocaching/StaticMapsProvider.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/cgeo/geocaching/StaticMapsProvider.java b/main/src/cgeo/geocaching/StaticMapsProvider.java index 15193db..f55d30a 100644 --- a/main/src/cgeo/geocaching/StaticMapsProvider.java +++ b/main/src/cgeo/geocaching/StaticMapsProvider.java @@ -31,7 +31,7 @@ public class StaticMapsProvider { private static final String ROADMAP = "roadmap"; private static final String WAYPOINT_PREFIX = "wp"; private static final String MAP_FILENAME_PREFIX = "map_"; - private static final String MARKERS_URL = "http://cgeo.carnero.cc/_markers/"; + private static final String MARKERS_URL = "http://status.cgeo.org/assets/markers/"; /** We assume there is no real usable image with less than 1k */ private static final int MIN_MAP_IMAGE_BYTES = 1000; /** ThreadPool restricting this to 1 Thread. **/ |