Andrew Grieve 4382234676 Merge branch 'master' into 4.0.x (fix windows space-in-path bug) ... close #147 Conflicts: VERSION bin/templates/cordova/version framework/assets/www/cordova.js framework/src/org/apache/cordova/CordovaWebView.java package.json		2015-01-13 10:01:31 -05:00
..
cordova	Merge branch 'master' into 4.0.x (fix windows space-in-path bug)	2015-01-13 10:01:31 -05:00
project	Merge branch 'master' into 4.0.x (gradle properties)	2015-01-08 15:43:22 -05:00