linphone-iphone/Classes/LinphoneUI
Jehan Monnier 6e1ae646b5 Merge remote-tracking branch 'origin/conference'
Conflicts:
	Classes/LinphoneUI/LinphoneUIDelegates.h
	Classes/PhoneViewController.h
	Classes/PhoneViewController.m
	linphone.xcodeproj/project.pbxproj
	linphonerc
	submodules/liblinphone.xcodeproj/project.pbxproj
2011-11-18 17:18:49 +01:00
..
FastAddressBook.h fix mistake in license notice. 2011-08-12 17:54:29 +02:00
FastAddressBook.m fix mistake in license notice. 2011-08-12 17:54:29 +02:00
LinphoneManager.h merge vios IOS with master 2011-11-18 14:23:41 +01:00
LinphoneManager.m Merge remote-tracking branch 'origin/conference' 2011-11-18 17:18:49 +01:00
LinphoneUIDelegates.h Merge remote-tracking branch 'origin/conference' 2011-11-18 17:18:49 +01:00
LogView.h fix mistake in license notice. 2011-08-12 17:54:29 +02:00
UIBluetoothButton.h fix mistake in license notice. 2011-08-12 17:54:29 +02:00
UIBluetoothButton.m Fix various Xcode warnings 2011-11-08 14:37:39 +01:00
UICallButton.h fix mistake in license notice. 2011-08-12 17:54:29 +02:00
UICallButton.m Conference begins to work 2011-11-08 14:44:06 +01:00
UICamSwitch.h enable front cam 2011-07-21 16:40:54 +02:00
UICamSwitch.m enable front cam 2011-07-21 16:40:54 +02:00
UIDigitButton.h DTMF fixes 2011-11-08 14:44:06 +01:00
UIDigitButton.m DTMF fixes 2011-11-08 14:44:06 +01:00
UIDuration.h fix mistake in license notice. 2011-08-12 17:54:29 +02:00
UIDuration.m fix mistake in license notice. 2011-08-12 17:54:29 +02:00
UIEraseButton.h fix mistake in license notice. 2011-08-12 17:54:29 +02:00
UIEraseButton.m fix mistake in license notice. 2011-08-12 17:54:29 +02:00
UIHangUpButton.h fix mistake in license notice. 2011-08-12 17:54:29 +02:00
UIHangUpButton.m Conferencing integration continued 2011-11-08 14:44:06 +01:00
UILinphone.h Merge remote-tracking branch 'public/master' into dev_videoios 2011-11-01 22:20:12 +01:00
UIMuteButton.h fix mistake in license notice. 2011-08-12 17:54:29 +02:00
UIMuteButton.m fix mistake in license notice. 2011-08-12 17:54:29 +02:00
UIPauseResumeButton.h Pause SIP call when audio is interrupted by OS (on incoming GSM call for instance) 2011-10-24 11:46:20 +02:00
UIPauseResumeButton.m Conferencing integration continued 2011-11-08 14:44:06 +01:00
UISpeakerButton.h fix mistake in license notice. 2011-08-12 17:54:29 +02:00
UISpeakerButton.m Fix various Xcode warnings 2011-11-08 14:37:39 +01:00
UIToggleButton.h Fix various Xcode warnings 2011-11-08 14:37:39 +01:00
UIToggleButton.m Improved graphics/layout for incall view 2011-11-09 16:04:59 +01:00