Anis Kadri ac509369e9 forgot to resolve conflict		2011-10-14 15:49:16 -07:00
..
assets
libs
res	forgot to resolve conflict	2011-10-14 15:49:16 -07:00
src/com/phonegap	Fix Issue #258 - navigator.app.exitApp() and navigator.app.backHistory() not working in PhoneGap 1.1.0 on Android	2011-10-12 11:22:35 -05:00
.classpath
.project
AndroidManifest.xml
build.xml
default.properties