You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2015/03/26 18:52:42 UTC
[9/9] ios commit: Merge branch 'unplug-whitelist' into 4.0.x
Merge branch 'unplug-whitelist' into 4.0.x
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/a14e08ea
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/a14e08ea
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/a14e08ea
Branch: refs/heads/4.0.x
Commit: a14e08eaa95211450f513c64d569d8c333dee4c5
Parents: 2e5510e 1ebb298
Author: Ian Clelland <ic...@chromium.org>
Authored: Thu Mar 26 13:52:08 2015 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Thu Mar 26 13:52:08 2015 -0400
----------------------------------------------------------------------
.../Classes/Public/CDVCommandDelegateImpl.m | 3 +-
CordovaLib/Classes/Public/CDVConfigParser.h | 1 -
CordovaLib/Classes/Public/CDVConfigParser.m | 9 +-
CordovaLib/Classes/Public/CDVPlugin.h | 20 +++
CordovaLib/Classes/Public/CDVURLProtocol.m | 24 +---
CordovaLib/Classes/Public/CDVViewController.h | 9 +-
CordovaLib/Classes/Public/CDVViewController.m | 135 ++++++++++++++-----
7 files changed, 136 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org