Andrew Grieve 9c5e340fb8 Merge branch 'master' into 4.0.x (App plugin from config.xml -> code) ... Conflicts: bin/templates/cordova/defaults.xml framework/res/xml/config.xml framework/src/org/apache/cordova/CordovaWebView.java		2014-07-08 11:52:44 -04:00
..
cordova	Merge branch 'master' into 4.0.x (App plugin from config.xml -> code)	2014-07-08 11:52:44 -04:00
project	Merge branch 'master' into 4.0.x (ConfigXmlParser + two-phase init)	2014-07-07 16:23:51 -04:00