diff options
author | Christopher Baines <cbaines8@gmail.com> | 2012-02-26 23:38:47 +0000 |
---|---|---|
committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-26 23:38:47 +0000 |
commit | 7e88b00e017bde16c12e6adb78883acf7b2ba575 (patch) | |
tree | 309018e9979f47195a9a463cdcceeff0fbca9ef1 /res/values/strings.xml | |
parent | cc3f1f19a6de034413a37dfebd922fb8c51888e1 (diff) | |
parent | 9b09f1286a8a003f0d24f745f648748cd3c2f2e2 (diff) | |
download | southamptonuniversitymap-7e88b00e017bde16c12e6adb78883acf7b2ba575.tar southamptonuniversitymap-7e88b00e017bde16c12e6adb78883acf7b2ba575.tar.gz |
Merge branch 'dev'
Conflicts:
src/net/cbaines/suma/BusActivity.java
src/net/cbaines/suma/BusSpecificStopView.java
src/net/cbaines/suma/BusStopActivity.java
src/net/cbaines/suma/StopView.java
Diffstat (limited to 'res/values/strings.xml')
-rw-r--r-- | res/values/strings.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index c602a26..6333664 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -102,7 +102,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< <!-- About Strings --> <string name="about">About</string> <string name="about_version">Version</string> - <string name="about_version_summary">0.3 (alpha)</string> + <string name="about_version_summary">0.4 (alpha)</string> <string name="about_copyright">Copyright</string> <string name="about_copyright_summary">© 2012, Christopher Baines</string> <string name="about_license">License</string> @@ -127,5 +127,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.< <string name="about_database_summary">Using the ORMLite library.</string> <string name="about_donate">Donate</string> <string name="about_donate_summary">Make a personal donation to the developer through Bitcoin.</string> + <string name="buildingImageDescription">Image of the Building</string> </resources>
\ No newline at end of file |