diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-02-19 10:42:04 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-02-19 10:42:04 +0000 |
| commit | 40bd59ae8615f05c8f9d1b542f35ae39f98c2f5d (patch) | |
| tree | b6a6fa2fdbb7009859ef0ca4616a8b9c59169440 /AndroidManifest.xml | |
| parent | 4b4a5a0ebc7f285d7cdcfa1d72640dbc097bdbb2 (diff) | |
| parent | a02e8ae9eed3b2e3c105db19e84c27a0774172dd (diff) | |
| download | southamptonuniversitymap-40bd59ae8615f05c8f9d1b542f35ae39f98c2f5d.tar southamptonuniversitymap-40bd59ae8615f05c8f9d1b542f35ae39f98c2f5d.tar.gz | |
Merge branch 'dev'
Conflicts:
AndroidManifest.xml
res/values/strings.xml
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c606279..d69d2d5 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="5" - android:versionName="0.2.2 (alpha)" > + android:versionCode="6" + android:versionName="0.3 (alpha)" > <uses-sdk android:minSdkVersion="7" /> @@ -17,7 +17,7 @@ android:icon="@drawable/icon" android:label="@string/app_name" > <activity - android:name=".SouthamptonUniversityMapActivity" + android:name=".MapActivity" android:label="@string/app_name" > <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -27,7 +27,9 @@ </activity> <activity android:name="FindActivity" > </activity> - <activity android:name=".BusStopActivity" > + <activity android:name="BusStopActivity" > + </activity> + <activity android:name="BusActivity" > </activity> <activity android:name="AboutActivity" > </activity> |