Merge branch 'master' into wkwebview
Conflicts:
CordovaLib/Classes/CDVPlugin.h
CordovaLib/CordovaLib.xcodeproj/project.pbxproj
bin/templates/project/__CLI__.xcodeproj/project.pbxproj
bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/1e84e301
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/1e84e301
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/1e84e301
Branch: refs/heads/4.0.x
Commit: 1e84e301b098385a9b67a620c589c55b515db771
Parents: 3d39ef4 bab65b9
Author: Shazron Abdullah <shaz...@apache.org>
Authored: Mon Jul 21 22:25:20 2014 -0700
Committer: Shazron Abdullah <shaz...@apache.org>
Committed: Mon Jul 21 22:25:20 2014 -0700
----------------------------------------------------------------------
CordovaLib/Classes/CDVPlugin.h | 7 +--
CordovaLib/Classes/CDVPluginResult.h | 9 ++-
CordovaLib/Classes/CDVShared.h | 15 +----
CordovaLib/Classes/CDVShared.m | 59 --------------------
CordovaLib/Classes/CDVURLProtocol.m | 4 +-
CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 4 --
.../project/__CLI__.xcodeproj/project.pbxproj | 5 --
.../__NON-CLI__.xcodeproj/project.pbxproj | 5 --
.../Classes/MainViewController.m | 2 +-
hooks/pre-commit | 2 +
10 files changed, 16 insertions(+), 96 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/1e84e301/CordovaLib/Classes/CDVPlugin.h
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/1e84e301/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --cc CordovaLib/CordovaLib.xcodeproj/project.pbxproj
index 844db7b,6e67777..141fee8
--- a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
+++ b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
@@@ -382,8 -356,6 +379,7 @@@
EB96673C16A8970A00D86CDF /* CDVUserAgentUtil.m
in Sources */,
EBFF4DBC16D3FE2E008F452B /*
CDVWebViewDelegate.m in Sources */,
7E14B5A91705050A0032169E /* CDVTimer.m in
Sources */,
- 1B701029177A61CF00AE11F4 /* CDVShared.m in
Sources */,
+ 302D72FC19554BFC0028C99F /*
CDVWebViewOperationsDelegate.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/1e84e301/bin/templates/project/__CLI__.xcodeproj/project.pbxproj
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/1e84e301/bin/templates/project/__NON-CLI__.xcodeproj/project.pbxproj
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org
