Andrew Grieve f086ef5cad Merge branch 'master' into 4.0.x (adb CWD & build --unknown-flag) ... Conflicts: framework/src/org/apache/cordova/SplashScreenInternal.java		2014-12-11 13:47:07 -05:00
..
.settings	Fix NPE when POLLING bridge mode is used.	2014-02-18 22:11:38 -05:00
assets/www	CB-7707 Added multipart PluginResult (close #125)	2014-10-07 15:17:56 -04:00
res	Merge branch 'master' into 4.0.x (External whitelist changes)	2014-09-11 10:08:45 -04:00
src	Merge branch 'master' into 4.0.x (adb CWD & build --unknown-flag)	2014-12-11 13:47:07 -05:00
test/org/apache/cordova	CB-3: Apache source headers in callback-android	2012-02-23 11:36:08 -05:00
.classpath	Update .classpath to make Eclipse happy (just re-orders one line)	2014-07-04 11:38:31 -04:00
.project	Changing all tabs to spaces	2012-06-05 09:49:50 -04:00
AndroidManifest.xml	CB-6707 Update minSdkVersion to 10 consistently	2014-05-23 11:30:58 -07:00
ant.properties	CB-3: Apache source headers in callback-android	2012-02-23 11:36:08 -05:00
build.gradle	CB-8081 Allow gradle builds to use Java 6 instead of requiring 7	2014-11-26 11:44:49 -05:00
build.xml	CB-5490: add javadoc target to ant script	2013-11-26 13:06:28 -05:00
default.properties	Changing all tabs to spaces	2012-06-05 09:49:50 -04:00
project.properties	Removing the xwalk_core_library reference so we can use this with MozillaView	2014-04-29 22:50:11 -04:00