You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by sh...@apache.org on 2012/08/31 01:05:02 UTC

[1/4] ios commit: Merge branch 'refs/heads/CB-1182' into upstream-master

Updated Branches:
  refs/heads/master 0a99ba319 -> 9510225b1


Merge branch 'refs/heads/CB-1182' into upstream-master


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/9510225b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/9510225b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/9510225b

Branch: refs/heads/master
Commit: 9510225b17c982ff5ee9a4fa2f50625980a3d63f
Parents: 0a99ba3 d8575d7
Author: Shazron Abdullah <sh...@apache.org>
Authored: Thu Aug 30 16:04:35 2012 -0700
Committer: Shazron Abdullah <sh...@apache.org>
Committed: Thu Aug 30 16:04:35 2012 -0700

----------------------------------------------------------------------
 CordovaLib/Classes/CDVAvailability.h               |    6 +
 CordovaLib/Classes/CDVCapture.m                    |   12 +--
 CordovaLib/Classes/CDVLocation.m                   |    3 +-
 CordovaLib/Classes/CDVViewController.h             |    2 +-
 CordovaLib/Classes/CDVViewController.m             |  124 ++++++---------
 .../project/__TESTING__/Classes/AppDelegate.m      |   31 +++--
 6 files changed, 83 insertions(+), 95 deletions(-)
----------------------------------------------------------------------