mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-27 16:09:20 +00:00
Conflicts: Classes/AboutViewController.h Classes/AboutViewController.m Classes/AboutViewController.xib Classes/ContactDetailsTableViewController.m Classes/ContactsTableViewController.m Classes/ContactsViewController.m Classes/LinphoneCoreSettingsStore.m Classes/LinphoneManager.m Classes/LinphoneUI/UICompositeViewController.m Classes/LinphoneUI/UIContactCell.m Classes/LinphoneUI/UIContactDetailsHeader.m Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib Classes/PhoneMainView.h Classes/PhoneMainView.m Classes/PhoneMainView.xib Classes/SettingsViewController.m Classes/WizardViewController.m Classes/en.lproj/ContactDetailsLabelViewController.xib Classes/en.lproj/ContactDetailsViewController.xib Classes/en.lproj/ContactsViewController.xib Classes/fr.lproj/ContactDetailsLabelViewController.xib Classes/fr.lproj/ContactDetailsViewController.xib Classes/fr.lproj/ContactsViewController.xib Resources/en.lproj/Localizable.strings Resources/fr.lproj/Localizable.strings linphone.ldb/Contents.plist linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/5/ContactDetailsLabelViewController.xib linphone.ldb/Resources/Classes/ContactDetailsViewController/6/ContactDetailsViewController.xib linphone.ldb/Resources/Classes/ContactsViewController/14/ContactsViewController.xib linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/5/UIContactDetailsHeader.xib linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings linphone.xcodeproj/project.pbxproj submodules/externals/exosip |
||
|---|---|---|
| .. | ||
| LinphoneUI | ||
| Model | ||
| Utils | ||
| BuschJaegerApp.xib | ||
| BuschJaegerCallView.h | ||
| BuschJaegerCallView.m | ||
| BuschJaegerCallView.xib | ||
| BuschJaegerConfiguration.h | ||
| BuschJaegerConfiguration.m | ||
| BuschJaegerHistoryDetailsView.h | ||
| BuschJaegerHistoryDetailsView.m | ||
| BuschJaegerHistoryDetailsView.xib | ||
| BuschJaegerHistoryTableViewController.h | ||
| BuschJaegerHistoryTableViewController.m | ||
| BuschJaegerHistoryView.h | ||
| BuschJaegerHistoryView.m | ||
| BuschJaegerHistoryView.xib | ||
| BuschJaegerMainView.h | ||
| BuschJaegerMainView.m | ||
| BuschJaegerMainView.xib | ||
| BuschJaegerManualSettingsView.h | ||
| BuschJaegerManualSettingsView.m | ||
| BuschJaegerManualSettingsView.xib | ||
| BuschJaegerSettingsView.h | ||
| BuschJaegerSettingsView.m | ||
| BuschJaegerSettingsView.xib | ||
| BuschJaegerStationTableViewController.h | ||
| BuschJaegerStationTableViewController.m | ||
| BuschJaegerUtils.h | ||
| BuschJaegerUtils.m | ||
| BuschJaegerWelcomeView.h | ||
| BuschJaegerWelcomeView.m | ||
| BuschJaegerWelcomeView.xib | ||
| BuschJaegerWelcomeView~ipad.xib | ||
| LinphoneAppDelegate.h | ||
| LinphoneAppDelegate.m | ||
| LinphoneManager.h | ||
| LinphoneManager.m | ||