Andrew Grieve 6abb9da88a Merge branch 'master' into 4.0.x ... Conflicts: bin/templates/project/custom_rules.xml framework/src/org/apache/cordova/CordovaWebView.java test/src/org/apache/cordova/test/junit/MessageTest.java		2014-06-08 22:54:21 -04:00
..
.settings	Fix NPE when POLLING bridge mode is used.	2014-02-18 22:11:38 -05:00
assets/www	Update JS snapshot to version 3.6.0-dev (via coho)	2014-05-23 11:30:58 -07:00
res	Renaming app plugin CoreAndroid to avoid confusion. It is now trivial to fix the JS away from App, but this will have to be a 4.x change	2014-05-26 13:11:27 -07:00
src	Merge branch 'master' into 4.0.x	2014-06-08 22:54:21 -04:00
test/org/apache/cordova	CB-3: Apache source headers in callback-android	2012-02-23 11:36:08 -05:00
.classpath	Update framework's .classpath to what Eclipse wants it to be.	2014-02-26 20:18:35 -05: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.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