Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-05-01 17:38:57 +02:00
commit 20116b9656
2 changed files with 2 additions and 2 deletions

View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:installLocation="auto"
android:versionName="@string/app_version"
android:versionCode="201"
android:versionCode="211"
package="net.osmand.plus">
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="21" />

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="app_name">OsmAnd~</string>
<string name="app_version">2.0.0</string>
<string name="app_version">2.1.0</string>
<!--
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