aboutsummaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorHerbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com>2012-03-24 00:44:14 +0100
committerHerbert von Broeuschmeul <Herbert.Broeuschmeul@gmail.com>2012-03-24 00:44:14 +0100
commit01bcfd6aa8f1d16a07c54d8cc6ad21411080223d (patch)
tree7ee445719f20528fd605b5198d58c92ee91bb67a /res/values
parent51b3eaf859c30629bfd8ccd67731e956a9fa5055 (diff)
parentaa7539559beb4fc5ce6892b2c2265fe5a630583e (diff)
downloadBlueGPS-01bcfd6aa8f1d16a07c54d8cc6ad21411080223d.zip
BlueGPS-01bcfd6aa8f1d16a07c54d8cc6ad21411080223d.tar.gz
BlueGPS-01bcfd6aa8f1d16a07c54d8cc6ad21411080223d.tar.bz2
Merge branch 'BlueGPS4Droid_1.2.x' into BlueGPS4Cupcake_1.2.x
Diffstat (limited to 'res/values')
-rw-r--r--res/values/constants.xml2
-rw-r--r--res/values/strings.xml4
2 files changed, 3 insertions, 3 deletions
diff --git a/res/values/constants.xml b/res/values/constants.xml
index 331eef3..9b47fe2 100644
--- a/res/values/constants.xml
+++ b/res/values/constants.xml
@@ -19,7 +19,7 @@
along with BluetoothGPS4Droid. If not, see : http://www.gnu.org/licenses/.
-->
<resources>
- <string name="versionName">1.2.3</string>
+ <string name="versionName">1.2.4</string>
<string name="pref_start_gps_key">startGps</string>
<string name="pref_gps_location_provider_key">gpsLocationProviderKey</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1889aec..b8acc17 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -112,8 +112,8 @@
<string name="about_title">About</string>
<string name="about_version">BluetoothGPS4Droid version</string>
- <string name="about_copyright_1">Copyright (C) 2010 Herbert von Broeuschmeul</string>
- <string name="about_copyright_2">Copyright (C) 2010 BluetoothGPS4Droid Project</string>
+ <string name="about_copyright_1">Copyright (C) 2010, 2011, 2012 Herbert von Broeuschmeul</string>
+ <string name="about_copyright_2">Copyright (C) 2010, 2011, 2012 BluetoothGPS4Droid Project</string>
<string name="about_app_desc">Bluetooth GPS for Android is an application
for using an external bluetooth GPS on Android devices.
</string>