incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [1/4] android commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android
Date Sat, 16 Jun 2012 01:40:06 GMT
Updated Branches:
  refs/heads/master 451afabfb -> aa45670d8


Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android


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

Branch: refs/heads/master
Commit: aa45670d8706235a59c7ffccf22a3845c7fc0f88
Parents: e6d801a 451afab
Author: Anis Kadri <anis.kadri@gmail.com>
Authored: Fri Jun 15 18:38:56 2012 -0700
Committer: Anis Kadri <anis.kadri@gmail.com>
Committed: Fri Jun 15 18:38:56 2012 -0700

----------------------------------------------------------------------
 VERSION                                            |    2 +-
 framework/src/org/apache/cordova/DroidGap.java     |   19 +++-
 framework/src/org/apache/cordova/FileTransfer.java |   10 +-
 .../apache/cordova/test/CordovaDriverAction.java   |   78 +++++++++++++
 .../apache/cordova/test/CordovaViewFactory.java    |   37 ++++++
 .../org/apache/cordova/test/LoadTimeoutTest.java   |   50 --------
 .../org/apache/cordova/test/UserWebViewTest.java   |   43 +++++++
 .../src/org/apache/cordova/test/WebDriverTest.java |   90 +++++++++++++++
 .../src/org/apache/cordova/test/WhitelistTest.java |   12 --
 test/src/org/apache/cordova/test/userwebview.java  |    6 +
 10 files changed, 276 insertions(+), 71 deletions(-)
----------------------------------------------------------------------



Mime
View raw message