Andrew Grieve 4c1942e3fe Merge branch 'master' into 4.0.x (build & create script updates) ...

Conflicts:
	bin/lib/check_reqs.js
	bin/lib/create.js
	bin/node_modules/which/package.json
	bin/templates/cordova/lib/build.js

2014-08-19 12:02:36 -04:00

..

android_sdk_version.js

CB-4872 - moved version script to promise model

2013-10-18 17:13:57 -07:00

check_reqs.js

CB-7330 Don't run "android update" during creation

2014-08-18 23:24:29 -04:00

create.js

Merge branch 'master' into 4.0.x (build & create script updates)

2014-08-19 12:02:36 -04:00

simpleargs.js

CB-5232 Change create script to use Cordova as a library.

2013-11-15 13:17:56 -05:00