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

104 commits

Author SHA1 Message Date
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
Jehan Monnier
93c8a62dbd fix x264 bug on iphone5 2012-11-09 02:04:10 +01: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
Simon Morlat
8fac0fa65e update openssl 2012-09-26 22:46:07 +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
Jehan Monnier
286efef8ae remove armv6 build 2012-09-21 22:29:33 +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
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
Sylvain Berfini
3835bb24d8 make ios build release instrad of adhoc 2012-05-03 16:59:31 +02:00
Simon Morlat
ec4beba395 Merge remote-tracking branch 'linphone/master' into buschjaeger 
Conflicts:
	linphone-Info.plist
	linphone.xcodeproj/project.pbxproj
 2012-05-03 15:50:02 +02:00
Jehan Monnier
b4ece1c7e1 implement wifi only mode 2012-05-02 09:25:39 +02:00
Simon Morlat
74c7a81c07 fix crash at startup because of missing srtp_shutdown 2012-04-27 17:12:25 +02:00
Jehan Monnier
c4f494a537 put all target first 2012-04-03 11:04:22 +02:00
Simon Morlat
46f934eaf2 repair gpl build 2012-03-26 17:13:06 +02:00
Simon Morlat
da017901fc make zrtp compilation optional 2012-03-26 12:27:24 +02:00
Simon Morlat
447556710d port to Xcode 4.3 (libvpx patch added) 2012-03-13 23:30:16 +01:00
Simon Morlat
bf174fe05a update README and config site to work with Xcode 4.3 2012-03-09 22:05:04 +01:00
Jehan Monnier
41a2a33666 g729A integration based on bcg729 2012-02-16 15:46:45 +01:00
Yann Diorcet
0de57c7d28 Fix ipa rule 2012-02-15 14:12:08 +01:00
Yann Diorcet
8fb0c59da9 Add rule to make ipa 2012-02-15 13:01:24 +01:00
Jehan Monnier
122fa2601d replace PKG_CONFIG_PATH by PKG_CONFIG_LIBDIR 2012-02-09 10:27:15 +01:00
Pierre-Eric Pelloux-Prayer
4d321f9055 Define MS2_MINIMAL_SIZE when building mediastreamer2 
This avoids embedding a not used 20kB image array
 2012-01-19 14:32:25 +01:00
Pierre-Eric Pelloux-Prayer
40783c14e4 Update libvpx 
And remove patch which isn't necessary anymore.
 2011-12-19 11:12:49 +01:00
Pierre-Eric Pelloux-Prayer
d3b45ea79c vp8: update build script 2011-12-15 14:47:16 +01:00
Pierre-Eric Pelloux-Prayer
e1fe0f0291 iOS: iPad port (UI and VP8 improvements) 
New xib files, new home screen.
libvpx updated, multithreading enabled
 2011-12-15 14:47:14 +01:00
Jehan Monnier
5d49e8d5d8 fix Could not read socket issue + speex issue 2011-11-28 12:36:45 +01:00
Pierre-Eric Pelloux-Prayer
d6ea52ed1a New speex version 2011-11-22 16:09:14 +01:00
Jehan Monnier
8e2ebf38dd update speex repo to use our version 
fix some compilation issue
 2011-11-21 12:53:43 +01:00
Jehan Monnier
8a1c3000cd merge vios IOS with master 2011-11-18 14:23:41 +01:00
Jehan Monnier
0ad82b4cff Merge remote-tracking branch 'private/dev_videoios' 
Conflicts:
	.gitmodules
	Classes/LinphoneAppDelegate.m
	Settings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	submodules/build/builder-iphone-os.mk
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone
 2011-11-15 10:54:56 +01:00
Jehan Monnier
9f976eb7bb fix srtp install 2011-11-14 16:51:03 +01:00
Jehan Monnier
68d395ad8f Revert "fix for sRTP not installed in multi-arch liblinphone-sdk, due to unidentified archives." 
This reverts commit b9db786072.
 2011-11-14 15:45:25 +01:00
Jehan Monnier
51915a4bac fix srtp build 2011-11-14 15:44:10 +01:00
Jehan Monnier
a77e2af47d fix missing call duration on outgoing calls 2011-11-04 12:20:53 +01:00
Guillaume Beraudo
fb2ddd1b33 Silk plugin for iPhone. 2011-11-03 13:44:49 +01:00
Jehan Monnier
fdf3d42b31 fix libvpx build issue 2011-11-03 08:23:05 +01:00
Jehan Monnier
4d8a4470a7 private version 1.0.7.3 2011-11-02 16:31:25 +01:00
Jehan Monnier
e187357992 fix wrong remote view orientation after call closed in landscape mode 2011-11-02 08:41:46 +01:00
Simon Morlat
eecb65d1d4 Merge remote-tracking branch 'public/master' into dev_videoios 
Conflicts:
	Classes/LinphoneUI/LinphoneManager.m
	Classes/LinphoneUI/LinphoneUIDelegates.h
	Classes/LinphoneUI/UILinphone.h
	Settings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	linphonerc
	submodules/build/builder-iphone-os.mk
	submodules/liblinphone.xcodeproj/project.pbxproj
 2011-11-01 22:20:12 +01:00
Jehan Monnier
e15cd59f4a fix vp8 2011-10-31 18:19:38 +01:00
Simon Morlat
f02f9f38f4 - update linphone and ms2 submodules for rate control 
- fix build issues
- fix all black video screen
- fix microphone button not restored in initial state
- attempt to disable idle timer, but with limited success...
 2011-10-28 22:01:58 +02:00
Guillaume
4b4319a628 Partial commit with changes on Sylvain's Mac. 2011-10-28 16:29:31 +02:00
Simon Morlat
b9db786072 fix for sRTP not installed in multi-arch liblinphone-sdk, due to unidentified archives. 2011-10-26 23:48:11 +02:00
Jehan Monnier
827bc6bb0e fix x264 lib not installed 2011-10-26 11:26:26 +02:00
Jehan Monnier
a8688f5012 fix build issue for sdk 2011-10-26 10:39:23 +02:00
Jehan Monnier
db47f93693 fix for silk 2011-10-21 23:11:29 +02:00
Jehan Monnier
1984838e1b add silk support 2011-10-21 16:05:43 +02:00
Jehan Monnier
04a9435c2a update linphone/ms2 with silk 2011-10-20 10:21:00 +02:00
Jehan Monnier
ddeaddf92d Merge remote-tracking branch 'public/master' into dev_videoios 
IOS migration

Conflicts:
	.gitignore
	.gitmodules
	linphone-Info.plist
	linphone.xcodeproj/project.pbxproj
	submodules/build/builder-iphone-os.mk
	submodules/build/iphone-config.site
	submodules/externals/osip
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone
 2011-10-19 11:36:27 +02:00