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
..
Advanced.plist	Use tls	2012-11-05 09:52:22 +01:00
audio.plist	Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui	2012-11-07 11:15:31 +01:00
Root.plist	Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui	2012-09-19 10:47:11 +02:00
video.plist	many bugfixes, work in progress	2012-06-12 00:38:34 +02:00