forked from mirrors/linphone-iphone
Conflicts: Classes/AboutViewController.h Classes/AboutViewController.m Classes/AboutViewController.xib Classes/ChatRoomTableViewController.m Classes/ChatRoomViewController.m Classes/ChatTableViewController.m Classes/ContactDetailsTableViewController.m Classes/ContactDetailsViewController.m Classes/ContactsTableViewController.m Classes/HistoryDetailsViewController.m Classes/HistoryTableViewController.m Classes/HistoryViewController.m Classes/ImageViewController.h Classes/ImageViewController.m Classes/InCallTableViewController.h Classes/InCallTableViewController.m Classes/InCallViewController.m Classes/IncomingCallViewController.h Classes/IncomingCallViewController.m Classes/LinphoneAppDelegate.m Classes/LinphoneCoreSettingsStore.m Classes/LinphoneManager.m Classes/LinphoneUI/UICallBar.m Classes/LinphoneUI/UICallCell.h Classes/LinphoneUI/UICallCell.m Classes/LinphoneUI/UIChatCell.m Classes/LinphoneUI/UIChatRoomCell.m Classes/LinphoneUI/UIChatRoomCell.xib Classes/LinphoneUI/UICompositeViewController.m Classes/LinphoneUI/UIContactDetailsHeader.m Classes/LinphoneUI/UIMainBar.m Classes/LinphoneUI/UIStateBar.m Classes/LinphoneUI/en.lproj/UICallBar.xib Classes/LinphoneUI/en.lproj/UICallBar~ipad.xib Classes/LinphoneUI/en.lproj/UICallCell.xib Classes/LinphoneUI/en.lproj/UIConferenceHeader.xib Classes/LinphoneUI/fr.lproj/UICallBar.xib Classes/LinphoneUI/fr.lproj/UICallBar~ipad.xib Classes/LinphoneUI/fr.lproj/UICallCell.xib Classes/LinphoneUI/fr.lproj/UIConferenceHeader.xib Classes/PhoneMainView.m Classes/SettingsViewController.m Classes/WizardViewController.h Classes/WizardViewController.m Classes/en.lproj/DialerViewController.xib Classes/en.lproj/IncomingCallViewController.xib Classes/fr.lproj/DialerViewController.xib Classes/fr.lproj/IncomingCallViewController.xib Resources/en.lproj/Localizable.strings Resources/fr.lproj/Localizable.strings Settings.bundle/Root.plist Settings/InAppSettings.bundle/en.lproj/Audio.strings Settings/InAppSettings.bundle/fr.lproj/Audio.strings linphone-Info.plist linphone.ldb/Contents.plist linphone.ldb/Resources/Classes/DialerViewController/5/DialerViewController.xib linphone.ldb/Resources/Classes/ImageViewController/11/ImageViewController.xib linphone.ldb/Resources/Classes/IncomingCallViewController/9/IncomingCallViewController.xib linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings linphone.ldb/Resources/LinphoneUI/UICallBar/10/UICallBar.xib linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/8/UICallBar~ipad.xib linphone.ldb/Resources/LinphoneUI/UICallCell/10/UICallCell.xib linphone.ldb/Resources/LinphoneUI/UIConferenceHeader/6/UIConferenceHeader.xib linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings linphone.xcodeproj/project.pbxproj submodules/build/builders.d/openssl.mk |
||
|---|---|---|
| .. | ||
| UIAddressTextField.h | ||
| UIAddressTextField.m | ||
| UIBluetoothButton.h | ||
| UIBluetoothButton.m | ||
| UICallButton.h | ||
| UICallButton.m | ||
| UICamSwitch.h | ||
| UICamSwitch.m | ||
| UIDigitButton.h | ||
| UIDigitButton.m | ||
| UIEditableTableViewCell.h | ||
| UIEditableTableViewCell.m | ||
| UIEraseButton.h | ||
| UIEraseButton.m | ||
| UIHangUpButton.h | ||
| UIHangUpButton.m | ||
| UIHistoryCell.h | ||
| UIHistoryCell.m | ||
| UIHistoryCell.xib | ||
| UIHistoryDetailsCell.h | ||
| UIHistoryDetailsCell.m | ||
| UIHistoryDetailsCell.xib | ||
| UILightButton.h | ||
| UILightButton.m | ||
| UILinphone.h | ||
| UILinphone.m | ||
| UILinphoneButton.h | ||
| UILinphoneButton.m | ||
| UILinphoneTextField.h | ||
| UILinphoneTextField.m | ||
| UILoadingImageView.h | ||
| UILoadingImageView.m | ||
| UILongTouchButton.h | ||
| UILongTouchButton.m | ||
| UIMicroButton.h | ||
| UIMicroButton.m | ||
| UIPauseButton.h | ||
| UIPauseButton.m | ||
| UIRemoteImageView.h | ||
| UIRemoteImageView.m | ||
| UISpeakerButton.h | ||
| UISpeakerButton.m | ||
| UIStationCell.h | ||
| UIStationCell.m | ||
| UIStationCell.xib | ||
| UIToggleButton.h | ||
| UIToggleButton.m | ||
| UITransferButton.h | ||
| UITransferButton.m | ||
| UITransparentView.h | ||
| UITransparentView.m | ||
| UIVideoButton.h | ||
| UIVideoButton.m | ||
| VideoZoomHandler.h | ||
| VideoZoomHandler.m | ||