Andrew Grieve f086ef5cad Merge branch 'master' into 4.0.x (adb CWD & build --unknown-flag) ...

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

2014-12-11 13:47:07 -05:00

..

cordova

Merge branch 'master' into 4.0.x (adb CWD & build --unknown-flag)

2014-12-11 13:47:07 -05:00

project

Merge branch 'master' into 4.0.x (SplashScreen breakout)

2014-12-10 16:09:22 -05:00