You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2014/12/11 19:48:28 UTC
[7/7] android commit: Merge branch 'master' into 4.0.x (adb CWD &
build --unknown-flag)
Merge branch 'master' into 4.0.x (adb CWD & build --unknown-flag)
Conflicts:
framework/src/org/apache/cordova/SplashScreenInternal.java
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/f086ef5c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/f086ef5c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/f086ef5c
Branch: refs/heads/4.0.x
Commit: f086ef5cad1351b0f7790102d3f2723f7d3c68a7
Parents: 87cdc5a 56a3ee5
Author: Andrew Grieve <ag...@chromium.org>
Authored: Thu Dec 11 13:47:07 2014 -0500
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Thu Dec 11 13:47:07 2014 -0500
----------------------------------------------------------------------
CONTRIBUTING.md | 5 +++--
bin/templates/cordova/lib/build.js | 12 +++++++++---
bin/templates/cordova/lib/device.js | 9 +++++----
bin/templates/cordova/lib/emulator.js | 15 ++++++++-------
bin/templates/cordova/lib/log.js | 3 ++-
.../src/org/apache/cordova/CordovaPreferences.java | 3 +++
6 files changed, 30 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/f086ef5c/bin/templates/cordova/lib/build.js
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org