Andrew Grieve 6abb9da88a Merge branch 'master' into 4.0.x ... Conflicts: bin/templates/project/custom_rules.xml framework/src/org/apache/cordova/CordovaWebView.java test/src/org/apache/cordova/test/junit/MessageTest.java		2014-06-08 22:54:21 -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	Add missing semicolon	2013-12-05 12:41:28 -05:00
AndroidManifest.xml	Merge branch 'master' into 4.0.x	2014-06-08 22:54:21 -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