Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-12-06 21:38:42 +01:00
commit 285bc89761

View file

@ -6,7 +6,7 @@
<!--
Note: For our dev build apk's, the above "app_version" is provided (via osmand/build.xml) as the base version prefix to our build number in the format:
X.X.X#YYYYZ , where
X.X.X is the above base (released) app version,
X.X.X is the above base (released) "app_version",
YYYY is the build number of build branch Z
Z : M=-master, D=-design, B=-Blackberry, MD=-main-default, MQA=-main-qt-arm, MQDA=-main-qt-default-arm, S=-sherpafy
-->