linphone-iphone/Classes/LinphoneUI
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
..
UIAddressTextField.h Add animation 2012-06-21 18:38:40 +02:00
UIAddressTextField.m Don't use anymore shouldAutorotateToInterfaceOrientation: Private interface rotation 2012-08-10 13:21:14 +02:00
UIBluetoothButton.h fix mistake in license notice. 2011-08-12 17:54:29 +02:00
UIBluetoothButton.m Clean Linphone Manager 2012-07-17 10:48:14 +02:00
UICallButton.h Remove useless variables (with property defined) 2012-08-20 13:23:03 +02:00
UICallButton.m Modify history & chat 2012-07-16 17:52:03 +02:00
UICamSwitch.h Remove useless variables (with property defined) 2012-08-20 13:23:03 +02:00
UICamSwitch.m Add preview in dialer view on iPad 2012-09-14 11:13:18 +02:00
UIDigitButton.h Remove useless variables (with property defined) 2012-08-20 13:23:03 +02:00
UIDigitButton.m Remove useless variables (with property defined) 2012-08-20 13:23:03 +02:00
UIEditableTableViewCell.h Remove useless variables (with property defined) 2012-08-20 13:23:03 +02:00
UIEditableTableViewCell.m Improve Contact stuff 2012-07-16 11:05:38 +02:00
UIEraseButton.h Remove useless variables (with property defined) 2012-08-20 13:23:03 +02:00
UIEraseButton.m Clean Linphone Manager 2012-07-17 10:48:14 +02:00
UIHangUpButton.h Improve UI 2012-06-28 18:42:47 +02:00
UIHangUpButton.m implement message delivery status notification 2012-08-30 08:52:39 +02:00
UIHistoryCell.h Add history details view 2012-08-24 14:25:43 +02:00
UIHistoryCell.m Add ringtone settings 2012-09-12 11:25:36 +02:00
UIHistoryCell.xib Fix for iPad version 2012-09-17 15:05:34 +02:00
UIHistoryDetailsCell.h Add history details view 2012-08-24 14:25:43 +02:00
UIHistoryDetailsCell.m Add history details view 2012-08-24 14:25:43 +02:00
UIHistoryDetailsCell.xib Fix for iPad version 2012-09-17 15:05:34 +02:00
UILightButton.h Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui 2012-09-19 10:47:11 +02:00
UILightButton.m Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +02:00
UILinphone.h Fix chat scroll bug 2012-08-01 12:37:38 +02:00
UILinphone.m Fix chat scroll bug 2012-08-01 12:37:38 +02:00
UILongTouchButton.h Cleaning and continue working on new ui 2012-06-15 16:54:46 +02:00
UILongTouchButton.m Advanced memory leak fixes 2012-08-10 00:08:40 +02:00
UIMicroButton.h Rename classes ... split buttons enable/disable stuff 2012-06-14 18:31:09 +02:00
UIMicroButton.m Clean Linphone Manager 2012-07-17 10:48:14 +02:00
UIPauseButton.h Improve UI 2012-06-28 18:42:47 +02:00
UIPauseButton.m implement message delivery status notification 2012-08-30 08:52:39 +02:00
UIRemoteImageView.h Add history details view 2012-08-24 14:25:43 +02:00
UIRemoteImageView.m Add history details view 2012-08-24 14:25:43 +02:00
UISpeakerButton.h Rename classes ... split buttons enable/disable stuff 2012-06-14 18:31:09 +02:00
UISpeakerButton.m Split Speaker fix in linphone manager 2012-09-11 17:24:42 +02:00
UIStationCell.h Start history view 2012-08-23 16:18:24 +02:00
UIStationCell.m Start history view 2012-08-23 16:18:24 +02:00
UIStationCell.xib Start history view 2012-08-23 16:18:24 +02:00
UIToggleButton.h Add multi call support 2012-06-27 18:06:59 +02:00
UIToggleButton.m Improve UI 2012-07-02 18:49:14 +02:00
UITransferButton.h Remove useless variables (with property defined) 2012-08-20 13:23:03 +02:00
UITransferButton.m Start Contact views 2012-07-09 18:00:03 +02:00
UITransparentView.h Clean Linphone Manager 2012-07-17 10:48:14 +02:00
UITransparentView.m Clean Linphone Manager 2012-07-17 10:48:14 +02:00
UIVideoButton.h Fix video button disabled state 2012-08-21 14:50:33 +02:00
UIVideoButton.m Fix video button disabled state 2012-08-21 14:50:33 +02:00
VideoZoomHandler.h Cleaning and continue working on new ui 2012-06-15 16:54:46 +02:00
VideoZoomHandler.m Cleaning and continue working on new ui 2012-06-15 16:54:46 +02:00