Joe Bowser 7d282426c4 Merge branch 'master' into StudioProjectCompat ...

Another merge commit to track master changes

2017-09-14 11:45:57 -07:00

..

.settings

Fix NPE when POLLING bridge mode is used.

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

gradle/wrapper

CB-12524: Test distributing a wrapper in the framework directory

2017-03-13 13:51:36 -07:00

src/org/apache/cordova

Merge branch 'master' into StudioProjectCompat

2017-09-05 11:05:42 -07: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

Changing this so we pass lint

2017-06-14 09:57:25 -07:00

ant.properties

CB-3: Apache source headers in callback-android

2012-02-23 11:36:08 -05:00

build.gradle

Update maven repo to include most recent lib versions

2017-08-29 17:27:02 +02:00

build.xml

CB-5490: add javadoc target to ant script

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

cordova.gradle

Adding conditional code into Gradle, this is a bit dirty since we can't explicitly test it but we'll just have to rely on jasmine

2017-06-14 09:57:28 -07:00

default.properties

Changing all tabs to spaces

2012-06-05 09:49:50 -04:00

project.properties

CB-13177: Updating to API Level 26

2017-08-14 11:41:46 -07:00