Merge remote-tracking branch 'apache/master' into 2.6.x
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/acd1b966 Tree: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/tree/acd1b966 Diff: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/diff/acd1b966 Branch: refs/heads/2.6.x Commit: acd1b96676072ef3656bcbc431e8af06bcdb3b34 Parents: f6cbe2e b261439 Author: lorinbeer <[email protected]> Authored: Tue Apr 2 07:54:45 2013 -0700 Committer: lorinbeer <[email protected]> Committed: Tue Apr 2 07:54:45 2013 -0700 ---------------------------------------------------------------------- autotest/tests/filetransfer.tests.js | 45 +++++++++++++++++++++++++++++ cordova.js | 2 +- inappbrowser/index.html | 42 +++++++++++++++++++++++++-- inappbrowser/inject.css | 3 ++ inappbrowser/inject.html | 44 ++++++++++++++++++++++++++++ inappbrowser/inject.js | 2 + 6 files changed, 134 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
