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	2013-10-18 17:13:57 -07:00
android_sdk_version.bat	[CB-4872] - added android version scripts	2013-10-18 17:13:57 -07:00
check_reqs	Moving the console.log out of run() method	2013-11-29 14:39:09 -05:00
check_reqs.bat	[CB-3542] rewrote cli tooling scripts in node	2013-08-26 14:45:28 -07:00
create	CB-5715 Add Eclipse .project file to create template.	2014-01-02 16:40:48 -05:00
create.bat	[CB-3542] rewrote cli tooling scripts in node	2013-08-26 14:45:28 -07:00
update	CB-5232 Change create script to use Cordova as a library.	2013-11-15 13:17:56 -05:00
update.bat	[CB-3542] Convert update script to be node-based.	2013-09-13 22:49:15 -04:00