linphone-ios/Classes/LinphoneUI
Yann Diorcet 9ede4efa30 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into buschjaeger_new_ui
Conflicts:
	Classes/ChatRoomTableViewController.h
	Classes/ChatRoomViewController.h
	Classes/ChatViewController.h
	Classes/ConsoleViewController.h
	Classes/ContactDetailsLabelViewController.h
	Classes/ContactDetailsLabelViewController.m
	Classes/ContactDetailsTableViewController.h
	Classes/ContactDetailsTableViewController.m
	Classes/ContactDetailsViewController.h
	Classes/ContactDetailsViewController.m
	Classes/ContactsTableViewController.h
	Classes/ContactsViewController.h
	Classes/DialerViewController.h
	Classes/FirstLoginViewController.h
	Classes/HistoryDetailsViewController.h
	Classes/HistoryTableViewController.h
	Classes/HistoryTableViewController.m
	Classes/HistoryViewController.h
	Classes/InCallTableViewController.m
	Classes/InCallViewController.h
	Classes/IncomingCallViewController.h
	Classes/LinphoneCoreSettingsStore.m
	Classes/LinphoneManager.h
	Classes/LinphoneUI/UICallBar.h
	Classes/LinphoneUI/UICallCell.h
	Classes/LinphoneUI/UICallCell.m
	Classes/LinphoneUI/UIChatCell.h
	Classes/LinphoneUI/UIChatRoomCell.h
	Classes/LinphoneUI/UIChatRoomCell.m
	Classes/LinphoneUI/UICompositeViewController.h
	Classes/LinphoneUI/UICompositeViewController.m
	Classes/LinphoneUI/UIConferenceHeader.h
	Classes/LinphoneUI/UIContactCell.h
	Classes/LinphoneUI/UIContactDetailsFooter.h
	Classes/LinphoneUI/UIContactDetailsHeader.h
	Classes/LinphoneUI/UIHistoryCell.h
	Classes/LinphoneUI/UIMainBar.h
	Classes/LinphoneUI/UIStateBar.h
	Classes/Model/ChatModel.m
	Classes/Model/OutdoorStation.m
	Classes/MoreViewController.h
	Classes/PhoneMainView.h
	Classes/PhoneMainView.m
	Classes/SettingsViewController.h
	Classes/SettingsViewController.m
	Classes/WizardViewController.h
	nogpl-thirdparties/Settings.bundle/Advanced.plist
2012-08-20 13:27:38 +02:00
..
LogView.h fix mistake in license notice. 2011-08-12 17:54:29 +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 Clean Linphone Manager 2012-07-17 10:48:14 +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 Clean Linphone Manager 2012-07-17 10:48:14 +02:00
UILightButton.h Merge branch 'new_ui' into buschjaeger_new_ui 2012-08-20 11:08:16 +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 Remove useless variables (with property defined) 2012-08-20 13:23:03 +02:00
UISpeakerButton.h Rename classes ... split buttons enable/disable stuff 2012-06-14 18:31:09 +02:00
UISpeakerButton.m Clean Linphone Manager 2012-07-17 10:48:14 +02:00
UIStationCell.h Start Welcome View 2012-08-20 13:25:15 +02:00
UIStationCell.m Start Welcome View 2012-08-20 13:25:15 +02:00
UIStationCell.xib Start Welcome View 2012-08-20 13:25:15 +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 Remove useless variables (with property defined) 2012-08-20 13:23:03 +02:00
UIVideoButton.m Remove useless variables (with property defined) 2012-08-20 13:23:03 +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