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/3b4bfddb
Tree: http://git-wip-us.apache.org/repos/asf/cordova-osx/tree/3b4bfddb
Diff: http://git-wip-us.apache.org/repos/asf/cordova-osx/diff/3b4bfddb

Branch: refs/heads/master
Commit: 3b4bfddb8640331d5e751242bf244df98a24059c
Parents: 49ed121 a4e66dd
Author: Tobias Bocanegra <[email protected]>
Authored: Wed Nov 25 22:55:38 2015 -0800
Committer: Tobias Bocanegra <[email protected]>
Committed: Wed Nov 25 22:55:38 2015 -0800

----------------------------------------------------------------------
 .../CordovaLib/Classes/CDVViewController.h      | 15 +++++++++++++-
 .../CordovaLib/Classes/CDVViewController.m      | 19 +++++++++++-------
 .../Classes/Commands/CDVAvailability.h          | 14 +++++--------
 .../__PROJECT_NAME__/MainViewController.xib     | 21 ++++++++++++--------
 4 files changed, 44 insertions(+), 25 deletions(-)
----------------------------------------------------------------------



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to