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/07/10 16:30:37 UTC
[03/11] android commit: Merge branch 'master' into 4.0.x (unit test
tweaks)
Merge branch 'master' into 4.0.x (unit test tweaks)
Conflicts:
framework/src/org/apache/cordova/CordovaWebView.java
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/9358838d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/9358838d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/9358838d
Branch: refs/heads/4.0.x
Commit: 9358838dabbac72e132ab6facd5f142a9613df2b
Parents: a4d9f70 2f24e42
Author: Andrew Grieve <ag...@chromium.org>
Authored: Wed Jul 9 21:12:45 2014 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed Jul 9 21:12:45 2014 -0400
----------------------------------------------------------------------
LICENSE | 87 +++++++++++++++++++-
framework/src/org/apache/cordova/Config.java | 14 ++++
test/.classpath | 4 +-
.../test/junit/BackButtonMultiPageTest.java | 14 ++--
.../apache/cordova/test/junit/ErrorUrlTest.java | 2 +-
5 files changed, 111 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/9358838d/test/src/org/apache/cordova/test/junit/BackButtonMultiPageTest.java
----------------------------------------------------------------------