Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-11-30 16:27:33 +01:00
commit 7c33c46bdd

View file

@ -131,9 +131,9 @@
<!-- Map colors, layers, special purpose consistency colors --> <!-- Map colors, layers, special purpose consistency colors -->
<color name="pos_heading">#320000FF</color> <color name="pos_heading">#320000FF</color>
<color name="pos_heading_night">#880000FF</color> <color name="pos_heading_night">#88ff8800</color>
<color name="pos_area">#280000FF</color> <color name="pos_area">#280000FF</color>
<color name="pos_area_night">#660000FF</color> <color name="pos_area_night">#66ff8800</color>
<color name="pos_around">#707CDC</color> <!-- family blue similar to above --> <color name="pos_around">#707CDC</color> <!-- family blue similar to above -->
<color name="gpx_track">#B4B319FF</color> <color name="gpx_track">#B4B319FF</color>