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 /AndroidManifest.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 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d69d2d5..c796a99 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="net.cbaines.suma" - android:versionCode="6" - android:versionName="0.3 (alpha)" > + android:versionCode="7" + android:versionName="0.4 (alpha)" > <uses-sdk android:minSdkVersion="7" /> |