Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-06-13 23:59:08 +02:00
commit 6c9ef1144b

View file

@ -723,7 +723,7 @@ public class OsmandSettings {
}
;
}.makeGlobal().cache();
}.makeGlobal();
public final OsmandPreference<SpeedConstants> SPEED_SYSTEM = new EnumIntPreference<SpeedConstants>(
@ -753,7 +753,7 @@ public class OsmandSettings {
;
}.makeProfile().cache();
}.makeProfile();
// this value string is synchronized with settings_pref.xml preference name