Ian Clelland 51e634ccb4 Merge branch 'master' into 4.0.x (up to 3.7.0-dev) ...

Conflicts:
	VERSION
	bin/templates/cordova/version
	framework/src/org/apache/cordova/CordovaWebView.java
	package.json
	test/src/org/apache/cordova/test/basicauth.java
	test/src/org/apache/cordova/test/menus.java

2014-09-11 10:16:46 -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-7410 clarify the title

2014-08-27 13:56:31 -04:00

xml

CB-7410 add whitelist entries to get iframe/GoogleMaps working

2014-08-26 17:20:58 -04:00