cordova-android

mirror of https://github.com/apache/cordova-android.git synced 2025-04-13 19:43:06 +08:00

History

Andrew Grieve 1571b26a65 Merge branch 'master' into 4.0.x (ConfigXmlParser + two-phase init)

Conflicts:
	framework/src/org/apache/cordova/CordovaActivity.java
	framework/src/org/apache/cordova/CordovaChromeClient.java
	framework/src/org/apache/cordova/CordovaWebView.java
	framework/src/org/apache/cordova/CordovaWebViewClient.java
	framework/src/org/apache/cordova/PluginManager.java

2014-07-07 16:23:51 -04:00

lib

Merge branch 'master' into 4.0.x (bindButton changes)

2014-06-24 15:22:27 -04:00

node_modules

Manually fix Android sdk location to support library projects without local.properties

2014-05-22 14:04:00 -04:00

templates

Merge branch 'master' into 4.0.x (ConfigXmlParser + two-phase init)

2014-07-07 16:23:51 -04:00

android_sdk_version

CB-4872 - moved version script to promise model