Joe Bowser 9668272b80 Merge branch 'master' into 4.0.x ...

* Fix CB-8062 on 4.0.x branch

Conflicts:
	framework/src/org/apache/cordova/CordovaWebView.java

2015-01-09 13:38:38 -08:00

..

.settings

Fix NPE when POLLING bridge mode is used.

2014-02-18 22:11:38 -05:00

assets/www

CB-8210 Update JS snapshot with 4.0.x-specific platformVersion to fix CoreAndroid vs App plugin name

2015-01-05 22:09:12 -05:00

res

Merge branch 'master' into 4.0.x (External whitelist changes)

2014-09-11 10:08:45 -04:00

src/org/apache/cordova

Merge branch 'master' into 4.0.x

2015-01-09 13:38:38 -08: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-8255 Use properties rather than environment variables for gradle settings

2015-01-08 15:26:24 -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

CB-8026: Bumping up Android Version and setting it up to allow third-party cookies. This might change later.

2015-01-09 11:31:29 -08:00