diff options
| author | Herbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com> | 2010-11-04 01:29:10 +0100 |
|---|---|---|
| committer | Herbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com> | 2010-11-04 01:29:10 +0100 |
| commit | 513a2b910899567f0a37bf8186d8b1878eac9476 (patch) | |
| tree | 717d369c0a6f7285d613d1fbe640705f1e882149 /AndroidManifest.xml | |
| parent | 1289e75310955572d788c26015b10e6ecf253bc2 (diff) | |
| parent | b3cba0081dc0401c272ee0ecbad31d21d53bb9c2 (diff) | |
| download | BlueGPS-513a2b910899567f0a37bf8186d8b1878eac9476.zip BlueGPS-513a2b910899567f0a37bf8186d8b1878eac9476.tar.gz BlueGPS-513a2b910899567f0a37bf8186d8b1878eac9476.tar.bz2 | |
Merge branch 'dev_1.1.x' into dev_1.2.x
externalization of version name
Conflicts:
AndroidManifest.xml
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 031b17a..d9b0603 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -21,7 +21,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.broeuschmeul.android.gps.bluetooth.provider"
android:versionCode="120"
- android:versionName="1.2.0">
+ android:versionName="@string/versionName">
<application android:icon="@drawable/icon" android:label="@string/app_name" android:allowClearUserData="true">
<activity android:name=".BluetoothGpsActivity"
android:label="@string/app_name"
|