Merge remote-tracking branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/commit/f08af16a Tree: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/tree/f08af16a Diff: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/diff/f08af16a Branch: refs/heads/2.6.x Commit: f08af16ad6e10b74c63aab108ab7a1bb294b4c75 Parents: 826d443 b3caa3e Author: lorinbeer <[email protected]> Authored: Fri Mar 29 06:49:21 2013 -0700 Committer: lorinbeer <[email protected]> Committed: Fri Mar 29 06:49:21 2013 -0700 ---------------------------------------------------------------------- VERSION | 2 +- autotest/tests/filetransfer.tests.js | 45 +++++++++++++++++++++++++++++ cordova.js | 13 ++++++-- 3 files changed, 56 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
