incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From macdo...@apache.org
Subject [1/2] android commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-android
Date Fri, 30 Mar 2012 19:32:23 GMT
Updated Branches:
  refs/heads/master 900be3afe -> 8d479c826


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/8d479c82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/tree/8d479c82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/diff/8d479c82

Branch: refs/heads/master
Commit: 8d479c82698c74ea7d2315f19c9240775fe6406b
Parents: 700ae50 900be3a
Author: macdonst <simon.macdonald@gmail.com>
Authored: Fri Mar 30 15:31:54 2012 -0400
Committer: macdonst <simon.macdonald@gmail.com>
Committed: Fri Mar 30 15:31:54 2012 -0400

----------------------------------------------------------------------
 test/.classpath                                    |    9 +
 test/.project                                      |   33 +
 test/AndroidManifest.xml                           |   87 +
 test/README.md                                     |   23 +
 test/ant.properties                                |   17 +
 test/assets/www/backbuttonmultipage/index.html     |   23 +
 test/assets/www/backbuttonmultipage/sample2.html   |   23 +
 test/assets/www/backbuttonmultipage/sample3.html   |   26 +
 test/assets/www/background/index.html              |   99 +
 test/assets/www/background/index2.html             |   98 +
 test/assets/www/cordova-1.6.0rc1.js                | 4897 +++++++++++++++
 test/assets/www/cordova.js                         |    2 +
 test/assets/www/htmlnotfound/error.html            |    1 +
 test/assets/www/iframe/index.html                  |   33 +
 test/assets/www/iframe/index2.html                 |   24 +
 test/assets/www/index.html                         |   47 +
 test/assets/www/jqmtabbackbutton/index.html        |   49 +
 test/assets/www/jqmtabbackbutton/tab1.html         |   29 +
 test/assets/www/jqmtabbackbutton/tab2.html         |   30 +
 test/assets/www/jqmtabbackbutton/tab3.html         |   30 +
 test/assets/www/lifecycle/index.html               |  108 +
 test/assets/www/lifecycle/index2.html              |  104 +
 test/assets/www/main.js                            |  150 +
 test/assets/www/master.css                         |  117 +
 test/assets/www/menus/index.html                   |   29 +
 test/assets/www/splashscreen/index.html            |   22 +
 test/assets/www/userwebview/index.html             |   49 +
 test/assets/www/whitelist/index.html               |   29 +
 test/assets/www/whitelist/index2.html              |   23 +
 test/assets/www/xhr/index.html                     |   48 +
 test/build.xml                                     |   85 +
 test/libs/cordova-1.6.0rc1.jar                     |  Bin 0 -> 170594 bytes
 test/project.properties                            |   11 +
 test/res/drawable-hdpi/ic_launcher.png             |  Bin 0 -> 4147 bytes
 test/res/drawable-ldpi/ic_launcher.png             |  Bin 0 -> 1723 bytes
 test/res/drawable-mdpi/ic_launcher.png             |  Bin 0 -> 2574 bytes
 test/res/drawable/icon.png                         |  Bin 0 -> 5800 bytes
 test/res/drawable/sandy.jpg                        |  Bin 0 -> 48450 bytes
 test/res/layout/main.xml                           |   13 +
 test/res/values/strings.xml                        |    4 +
 test/res/xml/cordova.xml                           |    5 +
 test/res/xml/plugins.xml                           |   19 +
 .../org/apache/cordova/test/ActivityPlugin.java    |   81 +
 test/src/org/apache/cordova/test/FixWebView.java   |   43 +
 .../apache/cordova/test/backbuttonmultipage.java   |   30 +
 test/src/org/apache/cordova/test/background.java   |   34 +
 test/src/org/apache/cordova/test/errorurl.java     |   32 +
 test/src/org/apache/cordova/test/htmlnotfound.java |   31 +
 test/src/org/apache/cordova/test/iframe.java       |   30 +
 .../org/apache/cordova/test/jqmtabbackbutton.java  |   30 +
 test/src/org/apache/cordova/test/lifecycle.java    |   30 +
 test/src/org/apache/cordova/test/loading.java      |   31 +
 test/src/org/apache/cordova/test/menus.java        |   80 +
 test/src/org/apache/cordova/test/splashscreen.java |   35 +
 test/src/org/apache/cordova/test/tests.java        |   32 +
 test/src/org/apache/cordova/test/timeout.java      |   34 +
 test/src/org/apache/cordova/test/userwebview.java  |   72 +
 test/src/org/apache/cordova/test/whitelist.java    |   51 +
 test/src/org/apache/cordova/test/xhr.java          |   30 +
 59 files changed, 7102 insertions(+), 0 deletions(-)
----------------------------------------------------------------------



Mime
View raw message