Andrew Grieve 8d8b874c20 Merge branch 'master' into 4.0.x (about:blank) ...

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

2015-01-20 19:47:48 -05: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.8.0-dev (via coho)

2015-01-12 14:55:49 -08: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 (about:blank)

2015-01-20 19:47:48 -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

gradle: Fix incorrect buildTools dependencies in framework's build.gradle

2015-01-20 10:49:19 -05:00

build.xml

CB-5490: add javadoc target to ant script

2013-11-26 13:06:28 -05:00

cordova.gradle

CB-8026 Remove default target value from gradle file

2015-01-20 11:33:55 -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