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/11 17:28:47 UTC
[05/31] android commit: Merge branch 'CB-7291'
Merge branch 'CB-7291'
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/2e3e4ec3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/2e3e4ec3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/2e3e4ec3
Branch: refs/heads/4.0.x
Commit: 2e3e4ec3b246aae8fc89525dc061d15c70bb44ea
Parents: b6c5a5f 6e222c3
Author: Ian Clelland <ic...@chromium.org>
Authored: Tue Aug 26 15:25:41 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Tue Aug 26 15:25:41 2014 -0400
----------------------------------------------------------------------
framework/res/xml/config.xml | 15 +++++++++-
framework/src/org/apache/cordova/Config.java | 24 +++++++++++++--
.../src/org/apache/cordova/ConfigXmlParser.java | 31 +++++++++++++++++---
.../src/org/apache/cordova/CordovaActivity.java | 12 ++++----
.../org/apache/cordova/CordovaUriHelper.java | 24 +++++++--------
.../src/org/apache/cordova/CordovaWebView.java | 24 ++++++++++-----
framework/src/org/apache/cordova/Whitelist.java | 4 ---
7 files changed, 96 insertions(+), 38 deletions(-)
----------------------------------------------------------------------