You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by br...@apache.org on 2013/01/11 18:12:16 UTC
[2/2] ios commit: Merge branch 'master' into start_page
Updated Branches:
refs/heads/master 192122feb -> f259dcd4a
Merge branch 'master' into start_page
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/f259dcd4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/f259dcd4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/f259dcd4
Branch: refs/heads/master
Commit: f259dcd4aacaf40ee3c57dcbc5ccc3222cfafa9c
Parents: 6749c17 192122f
Author: Braden Shepherdson <br...@chromium.org>
Authored: Fri Jan 11 12:11:54 2013 -0500
Committer: Braden Shepherdson <br...@chromium.org>
Committed: Fri Jan 11 12:11:54 2013 -0500
----------------------------------------------------------------------
CordovaLib/Classes/CDV.h | 3 +-
CordovaLib/Classes/CDVCapture.m | 4 +-
CordovaLib/Classes/CDVCommandDelegateImpl.m | 4 +-
CordovaLib/Classes/CDVCommandQueue.m | 4 +-
CordovaLib/Classes/CDVCordovaView.h | 23 -
CordovaLib/Classes/CDVCordovaView.m | 37 -
CordovaLib/Classes/CDVDevice.m | 2 +-
CordovaLib/Classes/CDVFile.m | 4 +-
CordovaLib/Classes/CDVInvokedUrlCommand.m | 24 +-
CordovaLib/Classes/CDVJSON.h | 30 +
CordovaLib/Classes/CDVJSON.m | 77 +
CordovaLib/Classes/CDVPluginResult.m | 24 +-
CordovaLib/Classes/CDVSound.m | 3 +-
CordovaLib/Classes/CDVURLProtocol.h | 3 -
CordovaLib/Classes/CDVViewController.h | 10 +-
CordovaLib/Classes/CDVViewController.m | 6 +-
CordovaLib/Classes/JSON/JSONKit.h | 251 --
CordovaLib/Classes/JSON/JSONKit.m | 3061 ---------------
CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 33 +-
.../CDVPluginResultJSONSerializationTests.m | 24 +-
.../__TESTING__/Classes/MainViewController.m | 2 +-
21 files changed, 189 insertions(+), 3440 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/f259dcd4/CordovaLib/Classes/CDVViewController.m
----------------------------------------------------------------------