You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2013/01/30 00:21:01 UTC

[5/5] android commit: Merge branch 'puritytool'

Updated Branches:
  refs/heads/master 2e20bb063 -> 381ce535b


Merge branch 'puritytool'


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

Branch: refs/heads/master
Commit: 381ce535bff67a70339ecb4eb8cba9c6be7a5725
Parents: 2e20bb0 31055bb
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Jan 29 15:20:21 2013 -0800
Committer: Joe Bowser <bo...@apache.org>
Committed: Tue Jan 29 15:20:21 2013 -0800

----------------------------------------------------------------------
 test/assets/www/cordova.android.js                |  944 +++++++++-------
 test/src/org/apache/cordova/test/IFrameTest.java  |   66 +-
 test/src/org/apache/cordova/test/JQMTabTest.java  |   46 +-
 test/src/org/apache/cordova/test/util/Purity.java |  171 +++
 4 files changed, 785 insertions(+), 442 deletions(-)
----------------------------------------------------------------------