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

..

lib

Fix previous merges

2014-08-20 11:45:35 -04:00

node_modules

CB-3445: Add which to checked-in node_modules

2014-08-18 09:48:31 -04:00

templates

Fix previous merges

2014-08-20 11:45:35 -04:00

android_sdk_version

CB-4872 - moved version script to promise model

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

android_sdk_version.bat

[CB-4872] - added android version scripts

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

check_reqs

Moving the console.log out of run() method

2013-11-29 14:39:09 -05:00

check_reqs.bat

[CB-3542] rewrote cli tooling scripts in node

2013-08-26 14:45:28 -07:00

create

CB-5715 Add Eclipse .project file to create template.

2014-01-02 16:40:48 -05:00

create.bat

[CB-3542] rewrote cli tooling scripts in node

2013-08-26 14:45:28 -07:00

update

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

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

update.bat

[CB-3542] Convert update script to be node-based.

2013-09-13 22:49:15 -04:00