Joe Bowser 18fd54b9c0 Merging master into the Nitobi Github Branch ... Merge branch 'master' of git://github.com/sintaxi/phonegap Conflicts: android/src/com/android/droidgap/DroidGap.java		2008-12-18 15:21:04 -08:00
res	resolved android naming conflict	2008-11-28 13:58:41 -08:00
src/com/nitobi/phonegap	Removing old code	2008-12-18 15:13:30 -08:00
.classpath	Initial commit of the Android PhoneGap Code	2008-10-15 14:24:39 -07:00
.project	Initial commit of the Android PhoneGap Code	2008-10-15 14:24:39 -07:00
AndroidManifest.xml	Testing the refactoring command	2008-11-28 11:30:30 -08:00