Merge remote-tracking branch 'apache/master'
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/cb01eab0 Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/cb01eab0 Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/cb01eab0 Branch: refs/heads/master Commit: cb01eab027985fec036c8be0e1628ee5bf93531c Parents: a0d8dc7 bd48a6b Author: lorinbeer <[email protected]> Authored: Mon Apr 1 16:33:27 2013 -0700 Committer: lorinbeer <[email protected]> Committed: Mon Apr 1 16:33:27 2013 -0700 ---------------------------------------------------------------------- CordovaLib/Classes/CDV.h | 1 + CordovaLib/Classes/CDVFileTransfer.h | 7 + CordovaLib/Classes/CDVFileTransfer.m | 166 ++++++++++++++---- CordovaLib/Classes/CDVTimer.h | 27 +++ CordovaLib/Classes/CDVTimer.m | 123 +++++++++++++ CordovaLib/Classes/CDVViewController.m | 52 +++--- CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 8 + CordovaLib/cordova.ios.js | 43 +++-- bin/check_reqs | 34 ++++ 9 files changed, 382 insertions(+), 79 deletions(-) ----------------------------------------------------------------------
