You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by tr...@apache.org on 2016/01/05 20:20:04 UTC
[4/8] mac commit: Merge branch 'master' into dev
Merge branch 'master' into dev
Project: http://git-wip-us.apache.org/repos/asf/cordova-osx/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-osx/commit/49ed1213
Tree: http://git-wip-us.apache.org/repos/asf/cordova-osx/tree/49ed1213
Diff: http://git-wip-us.apache.org/repos/asf/cordova-osx/diff/49ed1213
Branch: refs/heads/master
Commit: 49ed1213a4436aff2fa6bfa56d46c57c07d98440
Parents: d20dcf0 ea9a45b
Author: Tobias Bocanegra <tr...@adobe.com>
Authored: Wed Nov 25 17:28:30 2015 -0800
Committer: Tobias Bocanegra <tr...@adobe.com>
Committed: Wed Nov 25 17:28:30 2015 -0800
----------------------------------------------------------------------
.ratignore | 5 +-
CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 16 --
.../CordovaLib/Classes/CDVWebViewDelegate.m | 15 +-
.../CordovaLib/Classes/Commands/CDVConnection.h | 34 ---
.../CordovaLib/Classes/Commands/CDVConnection.m | 125 ---------
.../Classes/Commands/CDVReachability.h | 85 ------
.../Classes/Commands/CDVReachability.m | 261 -------------------
.../CordovaLib/Classes/Localizable.strings | 19 ++
CordovaLib/CordovaLib/CordovaLib-Prefix.pch | 23 +-
.../__NON-CLI__.xcodeproj/project.pbxproj | 12 -
.../__PROJECT_NAME__/MainViewController.xib | 20 ++
.../__PROJECT_NAME__-Prefix.pch | 23 +-
.../project/__PROJECT_NAME__/config.xml | 16 ++
.../__PROJECT_NAME__/en.lproj/Credits.rtf | 29 ---
.../__PROJECT_NAME__/en.lproj/InfoPlist.strings | 19 ++
.../en.lproj/MainViewController.strings | 18 ++
.../CordovaLibApp/CordovaLibApp-Prefix.pch | 23 +-
.../CordovaLibApp/MainViewController.xib | 20 ++
tests/CordovaLibTests/CordovaLibApp/config.xml | 23 +-
.../CordovaLibApp/en.lproj/Credits.rtf | 29 ---
.../CordovaLibApp/en.lproj/InfoPlist.strings | 21 +-
.../en.lproj/MainViewController.strings | 18 ++
.../CordovaLibTests/CordovaLibTests-Prefix.pch | 25 +-
.../CordovaLibTests.xcodeproj/project.pbxproj | 12 -
.../CordovaLibTests/en.lproj/InfoPlist.strings | 21 +-
25 files changed, 281 insertions(+), 631 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org