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	Added temporary Cordova splash for now	2012-03-15 10:54:43 -07:00
drawable-hdpi	Changing to the modern icon	2012-03-15 10:48:00 -07:00
drawable-ldpi	Changing to the modern icon	2012-03-15 10:48:00 -07:00
drawable-mdpi	Changing to the modern icon	2012-03-15 10:48:00 -07:00
layout	Changing all tabs to spaces	2012-06-05 09:49:50 -04:00
values	Changing all tabs to spaces	2012-06-05 09:49:50 -04:00
xml	Merge branch 'master' into 4.0.x (App plugin from config.xml -> code)	2014-07-08 11:52:44 -04:00