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/23 04:35:53 UTC
[7/7] android commit: Merge branch 'master' into 4.0.x (gradle plugin
template)
Merge branch 'master' into 4.0.x (gradle plugin template)
Conflicts:
bin/templates/cordova/lib/build.js
framework/build.gradle
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/363fc8de
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/363fc8de
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/363fc8de
Branch: refs/heads/4.0.x
Commit: 363fc8deb56d739e8630c2799a713a95e3803cbc
Parents: b09f973 ddac192
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon Sep 22 22:28:59 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon Sep 22 22:28:59 2014 -0400
----------------------------------------------------------------------
bin/templates/cordova/lib/build.js | 7 +++
bin/templates/cordova/lib/plugin-build.gradle | 63 ++++++++++++++++++++++
bin/templates/project/build.gradle | 21 ++++----
framework/build.gradle | 42 ++++++++-------
4 files changed, 104 insertions(+), 29 deletions(-)
----------------------------------------------------------------------