diff options
| author | Christopher Baines <cbaines8@gmail.com> | 2012-03-02 11:24:57 +0000 |
|---|---|---|
| committer | Christopher Baines <cbaines8@gmail.com> | 2012-03-02 11:24:57 +0000 |
| commit | 7874813b4b682c34f709bf7a465baa8407b2a00f (patch) | |
| tree | 115ed1b33806e139b87a93cedbc564fa41135206 /AndroidManifest.xml | |
| parent | f58d7d1fc227ed7de50ef5d48a49ff6709f3197b (diff) | |
| parent | e3be46bdee08ad5b336e143861790b705defc0bc (diff) | |
| download | southamptonuniversitymap-7874813b4b682c34f709bf7a465baa8407b2a00f.tar southamptonuniversitymap-7874813b4b682c34f709bf7a465baa8407b2a00f.tar.gz | |
Merge branch 'dev'
Conflicts:
gen/net/cbaines/suma/R.java
src/net/cbaines/suma/BusSpecificStopView.java
src/net/cbaines/suma/BusStopSpecificStopView.java
src/net/cbaines/suma/MapActivity.java
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5e61dd4..3a09be0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="net.cbaines.suma" - android:versionCode="8" - android:versionName="0.5 (alpha)" > + android:versionCode="9" + android:versionName="0.6 (alpha)" > - <uses-sdk android:minSdkVersion="7" /> + <uses-sdk + android:minSdkVersion="7" + android:targetSdkVersion="10" /> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> |