Ian Clelland 97008305ff Merge branch 'master' into pluggable_webview ...

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

2014-05-15 15:59:11 -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-08 15:32:28 -07:00

res

w00t! Managed to get XWalk to work. Next Step: Make it installable

2014-04-29 22:50:11 -04:00

src

Merge branch 'master' into pluggable_webview

2014-05-15 15:59:11 -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

Remove Application settings from framework/AndroidManifest.xml

2013-11-15 12:01:12 -05: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