You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2012/12/06 23:23:46 UTC

[10/18] ios commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-ios

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-ios


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/3c74479d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/3c74479d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/3c74479d

Branch: refs/heads/master
Commit: 3c74479da896fa38a39587bf3fc19d040b6d9a55
Parents: f3a6ecc 446d456
Author: purplecabbage <pu...@gmail.com>
Authored: Wed Aug 1 11:24:47 2012 -0700
Committer: purplecabbage <pu...@gmail.com>
Committed: Wed Aug 1 11:24:47 2012 -0700

----------------------------------------------------------------------
 .../01cordovalib-contents.xml                      |   21 --
 .../CordovaInstaller.pmdoc/01cordovalib.xml        |   53 ---
 CordovaInstaller/CordovaInstaller.pmdoc/index.xml  |   52 ---
 CordovaInstaller/cordova.png                       |  Bin 41499 -> 0 bytes
 CordovaInstaller/docs/.gitignore                   |    3 -
 CordovaInstaller/docs/README                       |   12 -
 CordovaInstaller/scripts/xcodevars.postinstall     |   39 ---
 CordovaLib/Classes/CDV.h                           |    1 +
 CordovaLib/Classes/CDVAvailability.h               |    7 +-
 CordovaLib/Classes/CDVContact.m                    |    2 +-
 CordovaLib/Classes/CDVDevice.m                     |   27 +--
 CordovaLib/Classes/CDVFileTransfer.h               |    6 +-
 CordovaLib/Classes/CDVFileTransfer.m               |  143 +++++----
 CordovaLib/Classes/CDVInvokedUrlCommand.h          |   31 ++-
 CordovaLib/Classes/CDVInvokedUrlCommand.m          |   70 +++-
 CordovaLib/Classes/CDVLocalStorage.m               |   12 +-
 CordovaLib/Classes/CDVViewController.m             |   38 ++-
 CordovaLib/Classes/JSON/JSONKit.m                  |   40 ++-
 CordovaLib/Classes/NSData+Base64.m                 |    2 +-
 CordovaLib/CordovaLibTests/CDVFileTransferTests.m  |   49 ++-
 CordovaLib/javascript/cordova.ios.js               |   41 +--
 Makefile                                           |  256 +++------------
 bin/create                                         |   28 +-
 bin/replaces                                       |    2 +-
 .../project/__TESTING__.xcodeproj/project.pbxproj  |   18 +-
 bin/templates/project/cordova/debug                |    6 +-
 bin/templates/project/cordova/emulate              |    6 +-
 bin/templates/project/cordova/log                  |    2 +-
 bin/templates/project/www/cordova-2.0.0.js         |   41 +--
 29 files changed, 362 insertions(+), 646 deletions(-)
----------------------------------------------------------------------