cordova-android/framework
Anis Kadri 5faed8378c Merge branch 'master' of github.com:phonegap/phonegap-android
Conflicts:
	framework/res/xml/phonegap.xml
	framework/src/com/phonegap/DroidGap.java
2011-10-14 15:43:13 -07:00
..
assets Don't override history.back since jQuery also does it. 2011-10-06 22:21:09 -05:00
libs Initial Move of the Javascript OUT of the shared directory: Android 2009-11-17 10:38:49 -08:00
res Merge branch 'master' of github.com:phonegap/phonegap-android 2011-10-14 15:43:13 -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 Initial Move of the Javascript OUT of the shared directory: Android 2009-11-17 10:38:49 -08:00
.project Initial Move of the Javascript OUT of the shared directory: Android 2009-11-17 10:38:49 -08:00
AndroidManifest.xml Remove xlargescreen since it is only supported if you are building with the latest SDK. Yes people *should* be building with that but it's not even on any phones yet 2011-08-20 13:30:11 -07:00
build.xml Moved around the scripts so that you can create a self contained project that you can run debug, emulate and log from 2011-08-26 10:54:37 -07:00
default.properties Changing default target to the highest for maximum compatibility 2011-06-27 10:22:57 -07:00