forked from mirrors/linphone-iphone
31accecfde
Conflicts: Classes/AboutViewController.h Classes/ChatRoomTableViewController.h Classes/ChatRoomTableViewController.m Classes/ChatRoomViewController.h Classes/ChatRoomViewController.m Classes/ChatViewController.m Classes/ConsoleViewController.m Classes/ConsoleViewController.xib Classes/ContactDetailsLabelViewController.m Classes/ContactDetailsTableViewController.m Classes/ContactDetailsViewController.m Classes/ContactsViewController.m Classes/DialerViewController.m Classes/HistoryViewController.m Classes/ImagePickerViewController.h Classes/ImageViewController.h Classes/ImageViewController.m Classes/InCallTableViewController.m Classes/InCallViewController.m Classes/LinphoneCoreSettingsStore.m Classes/LinphoneUI/UICallBar.m Classes/LinphoneUI/UICallCell.h Classes/LinphoneUI/UICallCell.m Classes/LinphoneUI/UIChatCell.h Classes/LinphoneUI/UIChatCell.m Classes/LinphoneUI/UIChatCell.xib Classes/LinphoneUI/UIChatRoomCell.h Classes/LinphoneUI/UIChatRoomCell.m Classes/LinphoneUI/UIChatRoomCell.xib Classes/LinphoneUI/UICompositeViewController.h Classes/LinphoneUI/UIContactDetailsHeader.m Classes/LinphoneUI/UIHistoryCell.xib Classes/LinphoneUI/UIMainBar.m Classes/LinphoneUI/UIStateBar.xib 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/en.lproj/UIContactDetailsFooter.xib Classes/LinphoneUI/en.lproj/UIContactDetailsHeader.xib Classes/LinphoneUI/en.lproj/UIMainBar.xib Classes/LinphoneUI/en.lproj/UIMainBar~ipad.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/LinphoneUI/fr.lproj/UIContactDetailsFooter.xib Classes/LinphoneUI/fr.lproj/UIContactDetailsHeader.xib Classes/LinphoneUI/fr.lproj/UIMainBar.xib Classes/LinphoneUI/fr.lproj/UIMainBar~ipad.xib Classes/Model/ChatModel.h Classes/Model/ChatModel.m Classes/PhoneMainView.h Classes/PhoneMainView.m Classes/PhoneMainView.xib Classes/SettingsViewController.m Classes/SettingsViewController.xib Classes/Utils/NinePatch/NinePatch.xcodeproj/project.pbxproj Classes/Utils/XMLRPC/XMLRPC.xcodeproj/project.pbxproj Classes/WizardViewController.h Classes/WizardViewController.m Classes/en.lproj/ChatRoomViewController.xib Classes/en.lproj/ChatViewController.xib Classes/en.lproj/ContactDetailsLabelViewController.xib Classes/en.lproj/ContactDetailsViewController.xib Classes/en.lproj/ContactsViewController.xib Classes/en.lproj/DialerViewController.xib Classes/en.lproj/DialerViewController~ipad.xib Classes/en.lproj/FirstLoginViewController.xib Classes/en.lproj/HistoryDetailsViewController.xib Classes/en.lproj/HistoryViewController.xib Classes/en.lproj/InCallViewController.xib Classes/en.lproj/IncomingCallViewController.xib Classes/en.lproj/WizardViewController.xib Classes/fr.lproj/ChatRoomViewController.xib Classes/fr.lproj/ChatViewController.xib Classes/fr.lproj/ContactDetailsLabelViewController.xib Classes/fr.lproj/ContactDetailsViewController.xib Classes/fr.lproj/ContactsViewController.xib Classes/fr.lproj/DialerViewController.xib Classes/fr.lproj/DialerViewController~ipad.xib Classes/fr.lproj/FirstLoginViewController.xib Classes/fr.lproj/HistoryDetailsViewController.xib Classes/fr.lproj/HistoryViewController.xib Classes/fr.lproj/InCallViewController.xib Classes/fr.lproj/IncomingCallViewController.xib Classes/fr.lproj/WizardViewController.xib README Resources/accept_default.png Resources/accept_over.png Resources/cancel_default.png Resources/cancel_over.png Resources/chat_add_default.png Resources/chat_add_over.png Resources/chat_back_default.png Resources/chat_back_over.png Resources/chat_default.png Resources/chat_default_landscape~ipad.png Resources/chat_default~ipad.png Resources/chat_edit_default.png Resources/chat_edit_over.png Resources/chat_message_delivered.png Resources/chat_message_inprogress.png Resources/chat_message_not_delivered.png Resources/chat_ok_default.png Resources/chat_ok_over.png Resources/chat_over.png Resources/chat_over_landscape~ipad.png Resources/chat_over~ipad.png Resources/chat_selected.png Resources/chat_selected_landscape~ipad.png Resources/chat_selected~ipad.png Resources/chat_send_default.png Resources/chat_send_disabled.png Resources/chat_send_over.png Resources/contact_back_default.png Resources/contact_back_over.png Resources/contact_cancel_default.png Resources/contact_cancel_over.png Resources/contact_edit_default.png Resources/contact_edit_over.png Resources/contact_ok_default.png Resources/contact_ok_disabled.png Resources/contact_ok_over.png Resources/contacts_add_default.png Resources/contacts_add_over.png Resources/contacts_all_default.png Resources/contacts_all_selected.png Resources/contacts_back_default.png Resources/contacts_back_over.png Resources/contacts_default.png Resources/contacts_default_landscape~ipad.png Resources/contacts_default~ipad.png Resources/contacts_linphone_default.png Resources/contacts_linphone_selected.png Resources/contacts_over.png Resources/contacts_over_landscape~ipad.png Resources/contacts_over~ipad.png Resources/contacts_selected.png Resources/contacts_selected_landscape~ipad.png Resources/contacts_selected~ipad.png Resources/decline_default.png Resources/decline_over.png Resources/dialer_address_background_landscape~ipad.png Resources/dialer_address_background~ipad.png Resources/dialer_default.png Resources/dialer_over.png Resources/dialer_selected.png Resources/en.lproj/Localizable.strings Resources/fr.lproj/Localizable.strings Resources/header_conference.png Resources/header_incoming.png Resources/history_all_default.png Resources/history_all_selected.png Resources/history_default.png Resources/history_default_landscape~ipad.png Resources/history_default~ipad.png Resources/history_details_add_default.png Resources/history_details_add_over.png Resources/history_details_back_default.png Resources/history_details_back_over.png Resources/history_edit_default.png Resources/history_edit_over.png Resources/history_missed_default.png Resources/history_missed_selected.png Resources/history_ok_default.png Resources/history_ok_over.png Resources/history_over.png Resources/history_over_landscape~ipad.png Resources/history_over~ipad.png Resources/history_selected.png Resources/history_selected_landscape~ipad.png Resources/history_selected~ipad.png Resources/linphonerc-factory Resources/linphonerc-factory~ipad Resources/micro_off_default.png Resources/micro_off_default_landscape.png Resources/micro_off_default_landscape~ipad.png Resources/micro_off_default~ipad.png Resources/micro_off_disabled.png Resources/micro_off_disabled_landscape.png Resources/micro_off_disabled_landscape~ipad.png Resources/micro_off_disabled~ipad.png Resources/micro_off_over.png Resources/micro_off_over_landscape.png Resources/micro_off_over_landscape~ipad.png Resources/micro_off_over~ipad.png Resources/micro_on_default.png Resources/micro_on_default_landscape.png Resources/micro_on_default_landscape~ipad.png Resources/micro_on_default~ipad.png Resources/micro_on_disabled.png Resources/micro_on_disabled_landscape.png Resources/micro_on_disabled_landscape~ipad.png Resources/micro_on_disabled~ipad.png Resources/micro_on_over.png Resources/micro_on_over_landscape.png Resources/micro_on_over_landscape~ipad.png Resources/micro_on_over~ipad.png Resources/options_add_default.png Resources/options_add_default_landscape.png Resources/options_add_default_landscape~ipad.png Resources/options_add_default~ipad.png Resources/options_add_disabled.png Resources/options_add_disabled_landscape.png Resources/options_add_disabled_landscape~ipad.png Resources/options_add_disabled~ipad.png Resources/options_add_over.png Resources/options_add_over_landscape.png Resources/options_add_over_landscape~ipad.png Resources/options_add_over~ipad.png Resources/options_default.png Resources/options_default_landscape.png Resources/options_default_landscape~ipad.png Resources/options_default~ipad.png Resources/options_disabled.png Resources/options_disabled_landscape.png Resources/options_disabled_landscape~ipad.png Resources/options_disabled~ipad.png Resources/options_over.png Resources/options_over_landscape.png Resources/options_over_landscape~ipad.png Resources/options_over~ipad.png Resources/options_selected.png Resources/options_selected_landscape.png Resources/options_selected_landscape~ipad.png Resources/options_selected~ipad.png Resources/options_transfer_default.png Resources/options_transfer_default_landscape.png Resources/options_transfer_default_landscape~ipad.png Resources/options_transfer_default~ipad.png Resources/options_transfer_disabled.png Resources/options_transfer_disabled_landscape.png Resources/options_transfer_disabled_landscape~ipad.png Resources/options_transfer_disabled~ipad.png Resources/options_transfer_over.png Resources/options_transfer_over_landscape.png Resources/options_transfer_over_landscape~ipad.png Resources/options_transfer_over~ipad.png Resources/settings_default.png Resources/settings_default_landscape~ipad.png Resources/settings_default~ipad.png Resources/settings_over.png Resources/settings_over_landscape~ipad.png Resources/settings_over~ipad.png Resources/settings_selected.png Resources/settings_selected_landscape~ipad.png Resources/settings_selected~ipad.png Resources/setup_back_default.png Resources/setup_back_disabled.png Resources/setup_back_over.png Resources/setup_cancel_default.png Resources/setup_cancel_disabled.png Resources/setup_cancel_over.png Resources/setup_start_default.png Resources/setup_start_disabled.png Resources/setup_start_over.png Resources/setup_welcome_logo.png Resources/speaker_off_default.png Resources/speaker_off_default_landscape.png Resources/speaker_off_default_landscape~ipad.png Resources/speaker_off_default~ipad.png Resources/speaker_off_disabled.png Resources/speaker_off_disabled_landscape.png Resources/speaker_off_disabled_landscape~ipad.png Resources/speaker_off_disabled~ipad.png Resources/speaker_off_over.png Resources/speaker_off_over_landscape.png Resources/speaker_off_over_landscape~ipad.png Resources/speaker_off_over~ipad.png Resources/speaker_on_default.png Resources/speaker_on_default_landscape.png Resources/speaker_on_default_landscape~ipad.png Resources/speaker_on_default~ipad.png Resources/speaker_on_disabled.png Resources/speaker_on_disabled_landscape.png Resources/speaker_on_disabled_landscape~ipad.png Resources/speaker_on_disabled~ipad.png Resources/speaker_on_over.png Resources/speaker_on_over_landscape.png Resources/speaker_on_over_landscape~ipad.png Resources/speaker_on_over~ipad.png Resources/switch_camera_default.png Resources/switch_camera_over.png Resources/toolsbar_background.png Resources/video_off_default.png Resources/video_off_default_landscape.png Resources/video_off_default_landscape~ipad.png Resources/video_off_default~ipad.png Resources/video_off_disabled.png Resources/video_off_disabled_landscape.png Resources/video_off_disabled_landscape~ipad.png Resources/video_off_disabled~ipad.png Resources/video_off_over.png Resources/video_off_over_landscape.png Resources/video_off_over_landscape~ipad.png Resources/video_off_over~ipad.png Resources/video_on_default.png Resources/video_on_default_landscape.png Resources/video_on_default_landscape~ipad.png Resources/video_on_default~ipad.png Resources/video_on_disabled.png Resources/video_on_disabled_landscape.png Resources/video_on_disabled_landscape~ipad.png Resources/video_on_disabled~ipad.png Resources/video_on_over.png Resources/video_on_over_landscape.png Resources/video_on_over_landscape~ipad.png Resources/video_on_over~ipad.png linphone-Info.plist linphone.ldb/Contents.plist linphone.ldb/Resources/Classes/ChatRoomViewController/37/ChatRoomViewController.xib linphone.ldb/Resources/Classes/ChatViewController/16/ChatViewController.xib linphone.ldb/Resources/Classes/ContactDetailsLabelViewController/4/ContactDetailsLabelViewController.xib linphone.ldb/Resources/Classes/ContactDetailsViewController/4/ContactDetailsViewController.xib linphone.ldb/Resources/Classes/ContactsViewController/13/ContactsViewController.xib linphone.ldb/Resources/Classes/DialerViewController/4/DialerViewController.xib linphone.ldb/Resources/Classes/DialerViewController~ipad/12/DialerViewController~ipad.xib linphone.ldb/Resources/Classes/FirstLoginViewController/5/FirstLoginViewController.xib linphone.ldb/Resources/Classes/HistoryDetailsViewController/5/HistoryDetailsViewController.xib linphone.ldb/Resources/Classes/HistoryViewController/12/HistoryViewController.xib linphone.ldb/Resources/Classes/InCallViewController/5/InCallViewController.xib linphone.ldb/Resources/Classes/IncomingCallViewController/6/IncomingCallViewController.xib linphone.ldb/Resources/Classes/WizardViews/17/WizardViews.xib linphone.ldb/Resources/LinphoneUI/UICallBar/9/UICallBar.xib linphone.ldb/Resources/LinphoneUI/UICallBar~ipad/7/UICallBar~ipad.xib linphone.ldb/Resources/LinphoneUI/UICallCell/9/UICallCell.xib linphone.ldb/Resources/LinphoneUI/UIContactDetailsFooter/3/UIContactDetailsFooter.xib linphone.ldb/Resources/LinphoneUI/UIContactDetailsHeader/4/UIContactDetailsHeader.xib linphone.ldb/Resources/LinphoneUI/UIMainBar/9/UIMainBar.xib linphone.ldb/Resources/LinphoneUI/UIMainBar~ipad/8/UIMainBar~ipad.xib linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings linphone.xcodeproj/project.pbxproj |
||
|---|---|---|
| .. | ||
| bcg729@1ad5aa5abd | ||
| build | ||
| externals | ||
| libilbc-rfc3951@a70714c2e8 | ||
| liblinphone.xcodeproj | ||
| linphone@d2bf8846e3 | ||
| msamr@17391e3246 | ||
| msilbc@fbb153573c | ||
| mssilk@1d81e34d6e | ||
| msx264@6ba1b86990 | ||
| liblinphone_Prefix.pch | ||