Ian Clelland dd5a337a49 Merge branch 'master' into 4.0.x ...

Conflicts:
	framework/src/org/apache/cordova/CordovaActivity.java

2014-09-11 10:18:35 -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-7512: Determine SDK and build tools version dynamcally at build time

2014-09-10 10:57:43 -04:00

cordova.gradle

CB-7512: Read android target from project.properties if possible

2014-09-10 11:39:29 -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

gitignore

CB-7335 Add a .gitignore to android project template

2014-08-19 11:59:18 -04:00

project.properties

CB-7330 Don't run "android update" during creation

2014-08-18 23:24:29 -04:00

settings.gradle

CB-3445: Read project.properties to configure gradle libraries

2014-08-20 11:42:04 -04:00