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/09/22 21:39:18 UTC
[2/2] android commit: Merge branch 'master' into 4.0.x (fix ant run
command)
Merge branch 'master' into 4.0.x (fix ant run command)
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/95815a55
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/95815a55
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/95815a55
Branch: refs/heads/4.0.x
Commit: 95815a558c67ed67467e22fbc514b69b9437cd67
Parents: d022be5 879da03
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Sep 22 15:38:59 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Sep 22 15:38:59 2014 -0400
----------------------------------------------------------------------
bin/templates/cordova/lib/build.js | 152 ++++++++++++++---------------
bin/templates/cordova/lib/device.js | 5 +-
bin/templates/cordova/lib/emulator.js | 5 +-
bin/templates/cordova/lib/run.js | 26 ++---
4 files changed, 93 insertions(+), 95 deletions(-)
----------------------------------------------------------------------