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/12 20:22:00 UTC

[2/2] android commit: Merge branch 'master' into 4.0.x (error messages)

Merge branch 'master' into 4.0.x (error messages)


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/30e8b818
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/30e8b818
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/30e8b818

Branch: refs/heads/4.0.x
Commit: 30e8b818f583fd6a3240b0b255ff201f008ad78a
Parents: 3cd567d 525ce0e
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Sep 12 14:21:47 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Sep 12 14:21:47 2014 -0400

----------------------------------------------------------------------
 bin/lib/check_reqs.js                 | 22 +++++++++++++++-------
 bin/templates/cordova/lib/emulator.js | 20 ++++++++------------
 2 files changed, 23 insertions(+), 19 deletions(-)
----------------------------------------------------------------------