Updated Branches: refs/heads/master ba3e35835 -> 3f5dc0024
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-js Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/commit/3f5dc002 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/tree/3f5dc002 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-js/diff/3f5dc002 Branch: refs/heads/master Commit: 3f5dc00244e99ddb462b641725be0d24e8d768a1 Parents: f666498 ba3e358 Author: Jesse MacFadyen <[email protected]> Authored: Wed Jun 20 16:57:44 2012 -0700 Committer: Jesse MacFadyen <[email protected]> Committed: Wed Jun 20 16:57:44 2012 -0700 ---------------------------------------------------------------------- lib/common/plugin/FileTransfer.js | 20 +++++++++- lib/common/plugin/FileTransferError.js | 7 ++- lib/common/plugin/splashscreen.js | 3 + lib/cordova.js | 8 +++- test/test.filetransfer.js | 54 +++++++++++++++++++++++++++ 5 files changed, 86 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
