Merge branch 'master' into wkwebview
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/93d819fa Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/93d819fa Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/93d819fa Branch: refs/heads/4.0.x Commit: 93d819fafd34fccd967c5fd459bf7ed80d863ff8 Parents: e0dc744 a98144b Author: Shazron Abdullah <shaz...@apache.org> Authored: Tue Jan 20 13:01:28 2015 -0800 Committer: Shazron Abdullah <shaz...@apache.org> Committed: Tue Jan 20 13:01:28 2015 -0800 ---------------------------------------------------------------------- .gitignore | 2 +- .reviewboardrc | 8 -------- .travis.yml | 1 + CordovaLib/Classes/CDVCommandQueue.m | 6 +++--- CordovaLib/Classes/CDVJSON.h | 8 ++++---- CordovaLib/Classes/CDVJSON.m | 9 +++++---- CordovaLib/Classes/CDVPluginResult.m | 2 +- .../CDVPluginResultJSONSerializationTests.m | 16 ++++++++-------- 8 files changed, 23 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/93d819fa/CordovaLib/Classes/CDVCommandQueue.m ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
