Andrew Grieve fdef0db87c Merge branch 'master' into 4.0.x (Load timeout, bridge secret, content: URI) ... Conflicts: framework/src/org/apache/cordova/CordovaWebView.java		2014-11-06 15:37:30 -05: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	CB-7674 move preference activation back into onCreate()	2014-09-30 19:38:34 -04:00
AndroidManifest.xml	Merge branch 'master' into 4.0.x (gradle fixes)	2014-09-16 13:02:55 -04:00
build.gradle	gradle: Allow storeType to be set (allows using .p12 files)	2014-10-21 12:59:34 -04:00
cordova.gradle	gradle: Fix warning about dynamic properties being deprecated	2014-09-23 21:04:04 -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-7726 fix typo in gitignore: ant-built -> ant-build	2014-10-27 12:33:09 -04:00
project.properties	CB-7330 Don't run "android update" during creation	2014-08-18 23:24:29 -04:00