You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2012/11/22 01:44:22 UTC
[1/2] ios commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-cordova-ios
Updated Branches:
refs/heads/master 6e60c222f -> 9ac596968
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cordova-ios
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/commit/9ac59696
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/9ac59696
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/9ac59696
Branch: refs/heads/master
Commit: 9ac596968564cf005b0b0e6bc787cda7712f8632
Parents: cb5f1c8 6e60c22
Author: Anis Kadri <an...@gmail.com>
Authored: Wed Nov 21 16:44:13 2012 -0800
Committer: Anis Kadri <an...@gmail.com>
Committed: Wed Nov 21 16:44:13 2012 -0800
----------------------------------------------------------------------
CordovaLib/Classes/CDVViewController.m | 24 ++-
CordovaLib/cordova.ios.js | 266 +++++++++------
CordovaLibTests/CordovaLibApp/AppDelegate.m | 3 +-
CordovaLibTests/CordovaLibApp/ViewController.m | 5 +-
.../project/__TESTING__/Classes/AppDelegate.m | 34 +--
.../__TESTING__/Classes/MainViewController.m | 11 +-
6 files changed, 191 insertions(+), 152 deletions(-)
----------------------------------------------------------------------