Ian Clelland 7caa96abcd Fix previous merges ... Build scripts (create and build) were mangled somewhat by the previous merge commits. This resets them to (almost) exactly the same state as the 3.6.x (master) branch. Conflicts: bin/lib/create.js		2014-08-20 11:45:35 -04:00
..
android_sdk_version.js	CB-7325 Fix error message in android_sdk_version.js when missing SDK on windows	2014-08-20 11:20:02 -04:00
check_reqs.js	CB-7330 Don't run "android update" during creation	2014-08-18 23:24:29 -04:00
create.js	Fix previous merges	2014-08-20 11:45:35 -04:00
simpleargs.js	CB-5232 Change create script to use Cordova as a library.	2013-11-15 13:17:56 -05:00