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
..
assets/www	Spelling fixes	2013-12-05 12:20:58 -05:00
res	CB-6860 Add activity_name and launcher_name to AndroidManifest.xml & strings.xml	2014-06-03 16:08:35 -04:00
Activity.java	Refactor: Use ConfigXmlParser in activity. Adds CordovaWebView.init()	2014-07-04 16:32:09 -04:00
AndroidManifest.xml	Merge branch 'master' into 4.0.x (ConfigXmlParser + two-phase init)	2014-07-07 16:23:51 -04:00
build.gradle	CB-3445: Add an initial set of Gradle build scripts	2014-06-17 17:36:26 -04:00
eclipse-project	CB-5715 Add Eclipse .project file to create template.	2014-01-02 16:40:48 -05:00
eclipse-project-CLI	CB-5715 For CLI, hide assets/www and res/xml/config.xml by default	2014-01-28 00:28:42 -05:00
libraries.gradle	CB-3445: Add an initial set of Gradle build scripts	2014-06-17 17:36:26 -04:00
settings.gradle	CB-3445: Add an initial set of Gradle build scripts	2014-06-17 17:36:26 -04:00