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

..

lib

Merge branch 'master' into 4.0.x

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

build

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

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

build.bat

CB-5209 Win: Cannot build Android app if project path contains spaces

2013-10-29 16:29:19 -04:00

clean

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

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

clean.bat

CB-5209 Win: Cannot build Android app if project path contains spaces

2013-10-29 16:29:19 -04:00

defaults.xml

Revert "defaults.xml: Add AndroidLaunchMode preference"

2014-05-29 14:50:01 -04:00

log

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

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

log.bat

CB-5209 Win: Cannot build Android app if project path contains spaces

2013-10-29 16:29:19 -04:00

run

CB-6876 Fix the "print usage"

2014-06-04 19:12:55 -04:00

run.bat

CB-5209 Win: Cannot build Android app if project path contains spaces

2013-10-29 16:29:19 -04:00

version

Set version to 4.0.0-dev

2014-06-06 15:00:41 -04:00

version.bat

CB-5209 Win: Cannot build Android app if project path contains spaces

2013-10-29 16:29:19 -04:00