Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
98e313e8f6
1 changed files with 5 additions and 5 deletions
|
@ -4,11 +4,11 @@
|
|||
<string name="app_name_ver">OsmAnd 1.9.3</string>
|
||||
<string name="app_version">1.9.3</string>
|
||||
<!--
|
||||
Note: For our dev build apk's, the above app_version should be provided as the base version prefix to our build number in the format: X.X.X#BUILD+BRANCH
|
||||
To achieve this, keep the value of app_version in sync with
|
||||
file: osmand/build.xml'
|
||||
line: <replaceregexp file="res/values/no_translate.xml" ...
|
||||
item X.X.X in: replace='"app_version">X.X.X${build.version}<'
|
||||
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,
|
||||
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
|
||||
-->
|
||||
|
||||
<!-- Not translatable -->
|
||||
|
|
Loading…
Reference in a new issue