incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bows...@apache.org
Subject [1/18] android commit: Merge Commit from latest master
Date Mon, 07 May 2012 22:57:57 GMT
Updated Branches:
  refs/heads/CordovaWebView 27e511b78 -> e28f09e95


Merge Commit from latest master


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

Branch: refs/heads/CordovaWebView
Commit: e28f09e95b0b7329b1d370d1e2355d3e0d0cc573
Parents: 27e511b 21f6d9c
Author: Joe Bowser <bowserj@apache.org>
Authored: Mon May 7 15:57:37 2012 -0700
Committer: Joe Bowser <bowserj@apache.org>
Committed: Mon May 7 15:57:37 2012 -0700

----------------------------------------------------------------------
 README.md                                          |   15 +-
 bin/node_modules/.bin/cake                         |    1 -
 bin/node_modules/.bin/coffee                       |    1 -
 bin/node_modules/.bin/nodeunit                     |    1 -
 bin/node_modules/coffee-script/.npmignore          |   11 -
 bin/node_modules/coffee-script/LICENSE             |   22 -
 bin/node_modules/coffee-script/README              |   48 -
 bin/node_modules/coffee-script/Rakefile            |   78 -
 bin/node_modules/coffee-script/bin/cake            |    7 -
 bin/node_modules/coffee-script/bin/coffee          |    7 -
 bin/node_modules/coffee-script/extras/jsl.conf     |   44 -
 bin/node_modules/coffee-script/lib/browser.js      |   75 -
 bin/node_modules/coffee-script/lib/cake.js         |   76 -
 .../coffee-script/lib/coffee-script.js             |  135 -
 bin/node_modules/coffee-script/lib/command.js      |  301 --
 bin/node_modules/coffee-script/lib/grammar.js      |  591 ----
 bin/node_modules/coffee-script/lib/helpers.js      |   66 -
 bin/node_modules/coffee-script/lib/index.js        |    8 -
 bin/node_modules/coffee-script/lib/lexer.js        |  656 -----
 bin/node_modules/coffee-script/lib/nodes.js        | 2289 ---------------
 bin/node_modules/coffee-script/lib/optparse.js     |  111 -
 bin/node_modules/coffee-script/lib/parser.js       |  676 -----
 bin/node_modules/coffee-script/lib/repl.js         |  123 -
 bin/node_modules/coffee-script/lib/rewriter.js     |  363 ---
 bin/node_modules/coffee-script/lib/scope.js        |  120 -
 bin/node_modules/coffee-script/package.json        |   27 -
 bin/node_modules/nodeunit/.gitignore               |    5 -
 bin/node_modules/nodeunit/.npmignore               |    3 -
 bin/node_modules/nodeunit/CONTRIBUTORS.md          |   60 -
 bin/node_modules/nodeunit/LICENSE                  |   19 -
 bin/node_modules/nodeunit/Makefile                 |  126 -
 bin/node_modules/nodeunit/README.md                |  432 ---
 bin/node_modules/nodeunit/bin/nodeunit             |  120 -
 bin/node_modules/nodeunit/bin/nodeunit.json        |   10 -
 bin/node_modules/nodeunit/deps/async.js            |  623 ----
 bin/node_modules/nodeunit/deps/console.log.js      |   55 -
 bin/node_modules/nodeunit/deps/ejs.js              |  125 -
 bin/node_modules/nodeunit/deps/json2.js            |  483 ---
 bin/node_modules/nodeunit/doc/nodeunit.md          |   60 -
 .../nodeunit/examples/browser/nodeunit.js          | 1757 -----------
 .../nodeunit/examples/browser/suite1.js            |   12 -
 .../nodeunit/examples/browser/suite2.js            |   13 -
 .../nodeunit/examples/browser/test.html            |   16 -
 bin/node_modules/nodeunit/img/example_fail.png     |  Bin 38642 -> 0 bytes
 bin/node_modules/nodeunit/img/example_pass.png     |  Bin 14133 -> 0 bytes
 bin/node_modules/nodeunit/index.js                 |    3 -
 bin/node_modules/nodeunit/lib/assert.js            |  316 --
 bin/node_modules/nodeunit/lib/core.js              |  260 --
 bin/node_modules/nodeunit/lib/nodeunit.js          |   82 -
 bin/node_modules/nodeunit/lib/reporters/browser.js |  119 -
 bin/node_modules/nodeunit/lib/reporters/default.js |  123 -
 bin/node_modules/nodeunit/lib/reporters/html.js    |  107 -
 bin/node_modules/nodeunit/lib/reporters/index.js   |    9 -
 bin/node_modules/nodeunit/lib/reporters/junit.js   |  183 --
 bin/node_modules/nodeunit/lib/reporters/minimal.js |  112 -
 .../nodeunit/lib/reporters/skip_passed.js          |  105 -
 bin/node_modules/nodeunit/lib/track.js             |   48 -
 bin/node_modules/nodeunit/lib/types.js             |  187 --
 bin/node_modules/nodeunit/lib/utils.js             |  209 --
 bin/node_modules/nodeunit/man1/nodeunit.1          |   95 -
 bin/node_modules/nodeunit/nodelint.cfg             |    4 -
 bin/node_modules/nodeunit/package.json             |   56 -
 bin/node_modules/nodeunit/share/junit.xml.ejs      |   19 -
 bin/node_modules/nodeunit/share/license.js         |   11 -
 bin/node_modules/nodeunit/share/nodeunit.css       |   70 -
 bin/package.json                                   |   45 +
 .../templates/project/assets/www/index.html        |   18 +
 .../cordova/templates/project/assets/www/main.js   |   19 +
 .../templates/project/assets/www/master.css        |   22 +-
 bin/tests/autotest.coffee                          |   20 +
 bin/tests/create.coffee                            |   19 +
 bin/tests/debug.coffee                             |   18 +
 framework/.classpath                               |    2 +-
 framework/libs/commons-codec-1.3.jar               |  Bin 46725 -> 0 bytes
 test/res/drawable-hdpi/ic_launcher.png             |  Bin 0 -> 6080 bytes
 test/res/drawable-ldpi/ic_launcher.png             |  Bin 0 -> 3096 bytes
 test/res/drawable-mdpi/ic_launcher.png             |  Bin 0 -> 4090 bytes
 test/res/xml/cordova.xml                           |   16 +-
 test/res/xml/plugins.xml                           |   20 +-
 79 files changed, 208 insertions(+), 11880 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-android/blob/e28f09e9/test/res/xml/plugins.xml
----------------------------------------------------------------------
diff --cc test/res/xml/plugins.xml
index 39da0f7,17074ef..17074ef
mode 100644,100755..100644
--- a/test/res/xml/plugins.xml
+++ b/test/res/xml/plugins.xml


Mime
View raw message