Merge from main repo

This commit is contained in:
Josh Kasten
2011-09-13 22:48:50 -05:00
parent 0b1c24e55c
commit 8cde2420e7
6 changed files with 39 additions and 24 deletions
@@ -200,7 +200,7 @@ public abstract class Constants {
}
public static final String MAPSHOP_BASE_URL =
"http://maps.google.com/maps/ms";
"https://maps.google.com/maps/ms";
/*
* Default values - keep in sync with those in preferences.xml.