Andrew Grieve a816a48416 Merge branch 'master' into 4.0.x (delete onDestroy) ... Conflicts: framework/assets/www/cordova.js framework/src/org/apache/cordova/CordovaWebView.java		2015-01-12 10:58:00 -05:00
..
cordova.js	Merge branch 'master' into 4.0.x (delete onDestroy)	2015-01-12 10:58:00 -05:00
index.html	[CB-3307] Rename cordova-VERSION.js -> cordova.js	2013-05-08 09:52:56 -04:00