diff options
| author | Keith Packard <keithp@keithp.com> | 2013-04-22 17:20:51 -0500 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-04-22 17:20:51 -0500 |
| commit | 33c3b2c57d0d4285b75d4dcf7ca67ad19da08c86 (patch) | |
| tree | a9ff47afab29fe141dcd1da0ca276b367f911cb6 /altosdroid/AndroidManifest.xml | |
| parent | 1a84db819a359be39be51c9105039ab28c9fc894 (diff) | |
| parent | 90b0db1ae53182c94bf12d661446fc369d916366 (diff) | |
Merge branch 'master' into stm-flash
Conflicts:
ao-tools/ao-stmload/ao-stmload.c
Diffstat (limited to 'altosdroid/AndroidManifest.xml')
| -rw-r--r-- | altosdroid/AndroidManifest.xml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/altosdroid/AndroidManifest.xml b/altosdroid/AndroidManifest.xml index 237c6dcf..04a679e1 100644 --- a/altosdroid/AndroidManifest.xml +++ b/altosdroid/AndroidManifest.xml @@ -17,8 +17,8 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.altusmetrum.AltosDroid" - android:versionCode="1" - android:versionName="1.1.9.3"> + android:versionCode="3" + android:versionName="1.2"> <uses-sdk android:targetSdkVersion="10" android:minSdkVersion="10"/> <!-- Google Maps --> <uses-feature android:glEsVersion="0x00020000" android:required="true"/> @@ -31,7 +31,6 @@ <!-- Permissions needed for GoogleMaps --> <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/> - <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> <permission android:name="org.altusmetrum.AltosDroid.permission.MAPS_RECEIVE" |