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 /res | |
| 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 'res')
| -rw-r--r-- | res/values/constants.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/res/values/constants.xml b/res/values/constants.xml index f02034e..a67e978 100644 --- a/res/values/constants.xml +++ b/res/values/constants.xml @@ -19,6 +19,8 @@ along with BluetoothGPS4Droid. If not, see : http://www.gnu.org/licenses/.
-->
<resources>
+ <string name="versionName">1.2.0</string>
+
<string name="pref_start_gps_key">startGps</string>
<string name="pref_gps_location_provider_key">gpsLocationProviderKey</string>
<string name="pref_replace_std_gps_key">replaceStdtGps</string>
|