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
..
backbuttonmultipage	CB-5346: remove dependency on device plugin	2013-11-13 15:09:19 -05:00
background	CB-5346: remove dependency on device plugin	2013-11-13 15:09:19 -05:00
backgroundcolor	CB-5346: remove dependency on device plugin	2013-11-13 15:09:19 -05:00
basicauth	CB-5346: remove dependency on device plugin	2013-11-13 15:09:19 -05:00
fullscreen	CB-5346: remove dependency on device plugin	2013-11-13 15:09:19 -05:00
htmlnotfound	CB-7410 Fix the errorUrl test	2014-08-29 17:38:03 -04:00
iframe	CB-5346: remove dependency on device plugin	2013-11-13 15:09:19 -05:00
jqmtabbackbutton	CB-5346 Fix and cleanup broken Android unit test	2013-11-11 16:19:01 -05:00
lifecycle	CB-5346: remove dependency on device plugin	2013-11-13 15:09:19 -05:00
menus	CB-7410 fix the menu test	2014-08-29 18:07:29 -04:00
splashscreen	CB-5346: remove dependency on device plugin	2013-11-13 15:09:19 -05:00
userwebview	CB-5346: remove dependency on device plugin	2013-11-13 15:09:19 -05:00
whitelist	CB-5346: remove dependency on device plugin	2013-11-13 15:09:19 -05:00
xhr	CB-5346: remove dependency on device plugin	2013-11-13 15:09:19 -05:00
cordova_plugins.js	CB-6784 Add missing licenses	2014-05-30 15:10:54 -04:00
error.html	Merging latest master, including new tests	2014-08-14 14:20:49 -07:00
index.html	CB-7410 clarify the title	2014-08-27 13:56:31 -04:00
main.js	CB-5346: remove dependency on device plugin	2013-11-13 15:09:19 -05:00
master.css	Adding Apache Header to Test Directory	2012-05-04 15:22:15 -07:00