Ian Clelland 97008305ff Merge branch 'master' into pluggable_webview ... Conflicts: framework/src/org/apache/cordova/CordovaWebView.java		2014-05-15 15:59:11 -04:00
..
cordova	Set VERSION to 3.6.0-dev (via coho)	2014-05-06 15:51:14 -07:00
project	Crosswalk runtime needs the two permissions to auto detect connection status.	2014-04-29 22:50:11 -04:00