Merge branch 'master' of git@github.com:bowserj/phonegap

Conflicts:
	android/AndroidManifest.xml
This commit is contained in:
Joe Bowser
2009-10-28 13:56:03 -07:00
+1 -1
View File
@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.phonegap.demo" android:versionName="1.0.1" android:versionCode="2">
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />