Ian Clelland 51e634ccb4 Merge branch 'master' into 4.0.x (up to 3.7.0-dev) ...

Conflicts:
	VERSION
	bin/templates/cordova/version
	framework/src/org/apache/cordova/CordovaWebView.java
	package.json
	test/src/org/apache/cordova/test/basicauth.java
	test/src/org/apache/cordova/test/menus.java

2014-09-11 10:16:46 -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.7.0-dev (via coho)

2014-08-29 16:34:17 -07: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 (External whitelist changes)

2014-09-11 10:08:45 -04: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-3445: Add an initial set of Gradle build scripts

2014-08-18 09:48:31 -04: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