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
..
en.lproj	Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui	2012-09-19 10:47:11 +02:00
fr.lproj	Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui	2012-09-19 10:47:11 +02:00