You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2014/09/15 18:16:39 UTC

[4/4] android commit: Merge branch 'master' into 4.0.x

Merge branch 'master' into 4.0.x


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

Branch: refs/heads/4.0.x
Commit: 4c1efe7ad4e72e5446f7cd5c2ca038bc58f3f4a7
Parents: be01ce0 4be92f2
Author: Ian Clelland <ic...@chromium.org>
Authored: Mon Sep 15 12:16:03 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Mon Sep 15 12:16:03 2014 -0400

----------------------------------------------------------------------
 bin/templates/project/cordova.gradle | 29 +++++++++++++----------------
 framework/assets/www/cordova.js      |  4 ++--
 2 files changed, 15 insertions(+), 18 deletions(-)
----------------------------------------------------------------------