Ian Clelland dd5a337a49 Merge branch 'master' into 4.0.x ...

Conflicts:
	framework/src/org/apache/cordova/CordovaActivity.java

2014-09-11 10:18: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

Use add --compact flag in check_reqs when listing targets. No functional change.

2014-09-10 12:44:17 -04:00

create.js

Merge branch 'master' into 4.0.x

2014-09-11 10:18:35 -04:00

simpleargs.js

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

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