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 2013/03/23 01:05:16 UTC
[06/13] ios commit: Merge remote-tracking branch 'upstream/master'
into CB-1285
Merge remote-tracking branch 'upstream/master' into CB-1285
merging upstream changes into local branch
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/8a605b31
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/8a605b31
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/8a605b31
Branch: refs/heads/master
Commit: 8a605b313d0841d37622db968a87119f3f09fce5
Parents: c960151 9ce85c2
Author: lorinbeer <lo...@adobe.com>
Authored: Fri Mar 22 11:30:42 2013 -0700
Committer: lorinbeer <lo...@adobe.com>
Committed: Fri Mar 22 11:30:42 2013 -0700
----------------------------------------------------------------------
CordovaLib/Classes/CDVAvailability.h | 5 +-
CordovaLib/VERSION | 2 +-
CordovaLib/cordova.ios.js | 137 ++++++++++++++++++++++---
CordovaLibTests/CordovaLibApp/config.xml | 1 +
bin/templates/project/www/index.html | 2 +-
5 files changed, 130 insertions(+), 17 deletions(-)
----------------------------------------------------------------------