mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-04-23 07:58:30 +00:00
Conflicts: Classes/InCallViewController.m Classes/LinphoneAppDelegate.m Classes/LinphoneUI/UICallBar.m Classes/LinphoneUI/UICallBar.xib Classes/LinphoneUI/UIMainBar.m Classes/LinphoneUI/UIMainBar.xib Classes/PhoneMainView.h Classes/PhoneMainView.m linphone.xcodeproj/project.pbxproj |
||
|---|---|---|
| .. | ||
| project.pbxproj | ||