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

..

drawable

Tests to verify Android native features.

2012-03-30 11:37:29 -05:00

drawable-hdpi

Removing Default Android Graphics and replacing them with our own

2012-05-07 15:24:57 -07:00

drawable-ldpi

Removing Default Android Graphics and replacing them with our own

2012-05-07 15:24:57 -07:00

drawable-mdpi

Removing Default Android Graphics and replacing them with our own

2012-05-07 15:24:57 -07:00

layout

Added two more required methods to CordovaWebView to get the Junit tests running, removed tests that make no sense

2014-05-14 11:09:21 -07:00

values

CB-5301 add missing license headers

2013-11-06 16:27:46 -05:00

xml

Move registration of App plugin from config.xml -> code

2014-07-08 11:47:26 -04:00