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

phonegap · Jul 17, 2009 · c0e4ed7 · c0e4ed7
2 parents f9298a1 + 4c08b34
commit c0e4ed7
Show file tree

Hide file tree

Showing 22 changed files with 1,117 additions and 1,464 deletions.
diff --git a/Makefile b/Makefile
@@ -131,3 +131,4 @@ lib/android/phonegap.js: javascripts/phonegap.js.base javascripts/acceleration.j
 	$(CAT) javascripts/android/device.js >> $@
 	$(CAT) javascripts/android/geolocation.js >> $@
 	$(CAT) javascripts/android/notification.js >> $@
+	$(CAT) javascripts/android/accelerometer.js >> $@
diff --git a/android/assets/index.html b/android/assets/index.html