witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity
1065 commits 24 branches 110 tags 140 MiB
Commit graph

346 commits

Author SHA1 Message Date
Yann Diorcet
6d631eb308 Merge branch 'master' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/ChatRoomViewController.m
	Classes/HistoryDetailsViewController.m
	Classes/IncomingCallViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneUI/UICallCell.m
	Classes/LinphoneUI/UIChatCell.xib
	Classes/LinphoneUI/UIChatRoomCell.m
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/SettingsViewController.m
	Resources/linphonerc-factory~ipad
	Settings.bundle/Advanced.plist
	Settings/InAppSettings.bundle/en.lproj/Network.strings
	Settings/InAppSettings.bundle/fr.lproj/Network.strings
	buschjaeger-Info.plist
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings
	linphone.xcodeproj/project.pbxproj
 2012-12-04 11:59:31 +01:00
Yann Diorcet
f9f2a81fe3 Update linphone submodule 2012-12-04 11:52:49 +01:00
Yann Diorcet
63eced2dc1 Fix previous commit for edge mode 2012-12-03 15:11:47 +01:00
Yann Diorcet
a7609ac1ea Update linphone submodule 2012-11-29 17:46:23 +01:00
Jehan Monnier
15682c9ca7 update submodule linphone 2012-11-23 11:19:55 +01:00
Yann Diorcet
eee32ec06f Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/LinphoneCoreSettingsStore.m
	submodules/linphone
 2012-11-21 12:20:45 +01:00
Yann Diorcet
1d4bed91f7 Update linphone submodule 2012-11-21 12:18:58 +01:00
Jehan Monnier
cca3bdce93 update sumodule linphone 2012-11-21 09:35:14 +01:00
Yann Diorcet
d2ed3855e1 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/ChatRoomTableViewController.m
	Classes/ChatRoomViewController.m
	Classes/ContactDetailsTableViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UICallBar.m
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/LinphoneUI/UIStateBar.m
	Classes/LinphoneUI/en.lproj/UICallBar.xib
	Classes/LinphoneUI/fr.lproj/UICallBar.xib
	Classes/en.lproj/ChatViewController.xib
	Classes/fr.lproj/ChatViewController.xib
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Classes/ChatViewController/19/ChatViewController.xib
	linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings
	linphone.ldb/Resources/LinphoneUI/UICallBar/12/UICallBar.xib
	linphone.xcodeproj/project.pbxproj
 2012-11-20 14:32:54 +01:00
Yann Diorcet
16c0c38c68 Update linphone submodule in order to fix message spaming crash issue (real one) 2012-11-19 16:03:30 +01:00
Yann Diorcet
054904c1f8 Update linphone submodule for fixing pcap issue 2012-11-19 14:30:20 +01:00
Yann Diorcet
082d73846d Update linphone submodule in order to fix message spaming crash issue 2012-11-19 12:34:33 +01:00
Yann Diorcet
0fb8aba646 Update linphone submodule 2012-11-09 13:46:35 +01:00
Simon Morlat
d5c4cc3603 update linphone submodule for important chat fix. 2012-11-09 02:32:43 +01:00
Jehan Monnier
93c8a62dbd fix x264 bug on iphone5 2012-11-09 02:04:10 +01:00
Yann Diorcet
e541869c96 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/ChatRoomViewController.m
	Classes/ContactsViewController.m
	Classes/HistoryDetailsViewController.h
	Classes/HistoryDetailsViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UIChatCell.m
	Classes/LinphoneUI/UIChatCell.xib
	Classes/LinphoneUI/UICompositeViewController.h
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/PhoneMainView.m
	Classes/SettingsViewController.m
	Classes/WizardViewController.m
	Classes/en.lproj/ChatViewController.xib
	Classes/en.lproj/ContactDetailsViewController.xib
	Classes/en.lproj/DialerViewController.xib
	Classes/en.lproj/FirstLoginViewController.xib
	Classes/en.lproj/HistoryDetailsViewController.xib
	Classes/fr.lproj/ChatRoomViewController.xib
	Classes/fr.lproj/ChatViewController.xib
	Classes/fr.lproj/ContactDetailsViewController.xib
	Classes/fr.lproj/DialerViewController.xib
	Classes/fr.lproj/FirstLoginViewController.xib
	Classes/fr.lproj/HistoryDetailsViewController.xib
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	Resources/linphonerc-factory
	Resources/linphonerc-factory~ipad
	Settings.bundle/Advanced.plist
	Settings/InAppSettings.bundle/Advanced.plist
	Settings/InAppSettings.bundle/Call.plist
	Settings/InAppSettings.bundle/en.lproj/Audio.strings
	Settings/InAppSettings.bundle/en.lproj/Call.strings
	Settings/InAppSettings.bundle/en.lproj/Root.strings
	Settings/InAppSettings.bundle/fr.lproj/Audio.strings
	Settings/InAppSettings.bundle/fr.lproj/Call.strings
	Settings/InAppSettings.bundle/fr.lproj/Video.strings
	linphone-Info.plist
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Classes/ChatViewController/17/ChatViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsViewController/5/ContactDetailsViewController.xib
	linphone.ldb/Resources/Classes/DialerViewController/6/DialerViewController.xib
	linphone.ldb/Resources/Classes/FirstLoginViewController/6/FirstLoginViewController.xib
	linphone.ldb/Resources/Classes/HistoryDetailsViewController/8/HistoryDetailsViewController.xib
	linphone.ldb/Resources/InAppSettings.bundle/Audio/1/Audio.strings
	linphone.ldb/Resources/InAppSettings.bundle/Call/1/Call.strings
	linphone.ldb/Resources/InAppSettings.bundle/Network/1/Network.strings
	linphone.ldb/Resources/InAppSettings.bundle/Root/1/Root.strings
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
	submodules/linphone
 2012-11-07 11:15:31 +01:00
Yann Diorcet
6778d0992a Working mic/playback gain settings 2012-11-06 15:20:38 +01:00
Yann Diorcet
5c5172cb8e Update linphone submodule 2012-10-31 11:20:37 +01:00
Yann Diorcet
635e159e6f Update linphone module and add in_call_timeout functions to settings 2012-10-31 10:59:00 +01:00
Yann Diorcet
c90e082352 Update exosip for previous commit 2012-10-23 11:55:58 +02:00
Yann Diorcet
8c28793b6b Add date in registration 2012-10-23 10:43:51 +02:00
Jehan Monnier
eda70942c4 answer busy if incomming call while GSM call in progress 2012-10-19 14:09:42 +02:00
Jehan Monnier
55a792aeea disable GL drawing until state is Active 2012-10-19 11:03:19 +02:00
Jehan Monnier
4e7b5a4182 update linphone submodule 2012-10-16 15:18:17 +02:00
Jehan Monnier
1214b1d0ee update submodule linphone 2012-10-11 15:51:08 +02:00
Yann Diorcet
d2253e0532 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
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
 2012-10-10 13:04:05 +02:00
Jehan Monnier
c35105c0a3 update submodule linphone to fix enable video settings 2012-10-08 18:31:23 +02:00
Jehan Monnier
aedcdd38ca update linphone submodule 2012-10-05 17:07:25 +02:00
Yann Diorcet
a235cedb74 Fix liblinphone 2012-10-05 10:44:05 +02:00
Jehan Monnier
22a50d41aa add user notif when video is disabled because of low bw 2012-10-03 18:11:30 +02:00
Jehan Monnier
9f7f8a97cb check callid from push notif before auto accepting call 2012-10-03 09:48:05 +02:00
Yann Diorcet
c91deefa48 Update linphone submodule 2012-10-02 16:45:59 +02:00
Jehan Monnier
ccbd5e882b update exosip to fix ssl error bug 2012-10-01 17:21:27 +02:00
Yann Diorcet
18103091cd Update liphone submodule 
Update about view
 2012-10-01 17:13:38 +02:00
Yann Diorcet
3ce20b2eae Update linphone submodule 2012-10-01 15:41:39 +02:00
Yann Diorcet
a390c33b8e Update linphone submodule 2012-09-27 14:02:48 +02:00
Yann Diorcet
7a577c058a Update linphone submodule 2012-09-27 10:20:07 +02:00
Simon Morlat
8fac0fa65e update openssl 2012-09-26 22:46:07 +02:00
Jehan Monnier
d6e28b0dbc update submodule linphone with ICE fix 2012-09-26 15:27:00 +02:00
Simon Morlat
4891d646da don't show video acceptance popup when video is disabled 
update linphone submodule
 2012-09-26 13:07:27 +02:00
Yann Diorcet
31accecfde Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
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
 2012-09-26 12:34:12 +02:00
Simon Morlat
cda3749bda update exosip (better logs for syscall error) 2012-09-26 12:04:32 +02:00
Jehan Monnier
2e5dc4c035 update submodule linphone for better ice management 2012-09-25 16:57:04 +02:00
Jehan Monnier
e030a73c74 fix get local address in case of 3G connectivity on ios 2012-09-24 12:41:54 +02:00
Jehan Monnier
286efef8ae remove armv6 build 2012-09-21 22:29:33 +02:00
Simon Morlat
1b8912ae87 update exosip (for expire limit) 2012-09-19 21:52:24 +02:00
Yann Diorcet
b7b80681ad Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 
Conflicts:
	Classes/BuschJaegerCallView.h
	Classes/ChatRoomTableViewController.h
	Classes/ChatRoomTableViewController.m
	Classes/ChatRoomViewController.h
	Classes/ChatRoomViewController.m
	Classes/ChatViewController.m
	Classes/ContactDetailsImagePickerController.h
	Classes/DialerViewController.h
	Classes/DialerViewController.m
	Classes/ImagePickerViewController.h
	Classes/ImageViewController.h
	Classes/ImageViewController.m
	Classes/InCallViewController.m
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.m
	Classes/LinphoneUI/UIChatCell.m
	Classes/LinphoneUI/UIChatRoomCell.h
	Classes/LinphoneUI/UIChatRoomCell.m
	Classes/LinphoneUI/UIChatRoomCell.xib
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/LinphoneUI/UIContactDetailsHeader.h
	Classes/LinphoneUI/UIContactDetailsHeader.m
	Classes/LinphoneUI/UILightButton.h
	Classes/LinphoneUI/UIStateBar.m
	Classes/Model/ChatModel.h
	Classes/Model/ChatModel.m
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/SettingsViewController.m
	Classes/WizardViewController.h
	Classes/WizardViewController.m
	Classes/en.lproj/ChatRoomViewController.xib
	Classes/en.lproj/ChatViewController.xib
	Classes/en.lproj/DialerViewController~ipad.xib
	Classes/en.lproj/HistoryViewController.xib
	Classes/en.lproj/InCallViewController.xib
	Classes/en.lproj/WizardViewController.xib
	Classes/fr.lproj/ChatRoomViewController.xib
	Classes/fr.lproj/ChatViewController.xib
	Classes/fr.lproj/DialerViewController~ipad.xib
	Classes/fr.lproj/HistoryViewController.xib
	Classes/fr.lproj/WizardViewController.xib
	Resources/chat_field.9.png
	Resources/chat_field.9@2x.png
	Resources/chat_send_default.png
	Resources/chat_send_disabled.png
	Resources/chat_send_over.png
	Resources/en.lproj/Localizable.strings
	Resources/fr.lproj/Localizable.strings
	Resources/linphonerc-factory~ipad
	Settings.bundle/Advanced.plist
	Settings.bundle/video.plist
	Settings/InAppSettings.bundle/Advanced.plist
	Settings/InAppSettings.bundle/Call.plist
	Settings/InAppSettings.bundle/en.lproj/Advanced.strings
	Settings/InAppSettings.bundle/en.lproj/Root.strings
	Settings/InAppSettings.bundle/en.lproj/Video.strings
	Settings/InAppSettings.bundle/fr.lproj/Advanced.strings
	Settings/InAppSettings.bundle/fr.lproj/Root.strings
	Settings/InAppSettings.bundle/fr.lproj/Video.strings
	linphone.ldb/Contents.plist
	linphone.ldb/Resources/Classes/ChatRoomViewController/17/ChatRoomViewController.xib
	linphone.ldb/Resources/Classes/ChatViewController/3/ChatViewController.xib
	linphone.ldb/Resources/Classes/ContactDetailsViewController/1/ContactDetailsViewController.xib
	linphone.ldb/Resources/Classes/DialerViewController~ipad/7/DialerViewController~ipad.xib
	linphone.ldb/Resources/Classes/HistoryViewController/2/HistoryViewController.xib
	linphone.ldb/Resources/Classes/InCallViewController/2/InCallViewController.xib
	linphone.ldb/Resources/Classes/WizardViewController/3/WizardViewController.xib
	linphone.ldb/Resources/InAppSettings.bundle/Advanced/1/Advanced.strings
	linphone.ldb/Resources/InAppSettings.bundle/Root/1/Root.strings
	linphone.ldb/Resources/InAppSettings.bundle/Video/1/Video.strings
	linphone.ldb/Resources/Resources/Localizable/1/Localizable.strings
	linphone.xcodeproj/project.pbxproj
 2012-09-19 10:47:11 +02:00
Jehan Monnier
c2f9a33286 Merge branch 'new_ui' of git.linphone.org:linphone-iphone into new_ui 2012-09-18 17:26:15 +02:00
Jehan Monnier
8a50dae15a fix build for xcode4.4 2012-09-18 15:55:36 +02:00
Jehan Monnier
20ef4a2469 xcode 4.6/ios6 support 
Conflicts:

	submodules/linphone
 2012-09-18 15:55:11 +02:00