Andrew Grieve 6abb9da88a Merge branch 'master' into 4.0.x ...

Conflicts:
	bin/templates/project/custom_rules.xml
	framework/src/org/apache/cordova/CordovaWebView.java
	test/src/org/apache/cordova/test/junit/MessageTest.java

2014-06-08 22:54:21 -04:00

..

appinfo.js

[CB-4782] Convert ApplicationInfo.java -> appinfo.js

2013-09-10 16:32:42 -04:00

build.js

Remove Ant custom build directories

2014-06-05 13:11:14 -04:00

clean.js

CB-5793 Add work-around for library references not working with custom output directory (ugh).

2014-01-21 15:09:15 -05:00

device.js

Fix type "LANCH" -> "LAUNCH"

2014-01-22 14:53:40 -05:00

emulator.js

CB-5803 Fix cordova/emulate on windows.

2014-01-16 13:19:39 -05:00

exec.js

CB-5714 Fix of android build when too big output stops build with error due to buffer overflow.

2013-12-30 11:06:37 -05:00

install-device

Refactoring Android project-level and platform scripts to use Q.js

2013-10-16 13:10:53 -04:00

install-device.bat

[CB-3542] rewrote cli tooling scripts in node

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

install-emulator

Refactoring Android project-level and platform scripts to use Q.js

2013-10-16 13:10:53 -04:00

install-emulator.bat

[CB-3542] rewrote cli tooling scripts in node

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

list-devices

Refactoring Android project-level and platform scripts to use Q.js

2013-10-16 13:10:53 -04:00

list-devices.bat

[CB-3542] rewrote cli tooling scripts in node

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

list-emulator-images

Refactoring Android project-level and platform scripts to use Q.js

2013-10-16 13:10:53 -04:00

list-emulator-images.bat

[CB-3542] rewrote cli tooling scripts in node

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

list-started-emulators

Refactoring Android project-level and platform scripts to use Q.js

2013-10-16 13:10:53 -04:00

list-started-emulators.bat

[CB-3542] rewrote cli tooling scripts in node

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

log.js

Spelling fixes

2013-12-05 12:20:58 -05:00

run.js

CB-6876 Show the correct executable name

2014-06-04 19:23:43 -04:00

spawn.js

CB-5801 Add spawn work-around on windows for it not being able to execute .cmd files

2014-01-16 12:11:31 -05:00

start-emulator

Refactoring Android project-level and platform scripts to use Q.js

2013-10-16 13:10:53 -04:00

start-emulator.bat

[CB-3542] rewrote cli tooling scripts in node

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