linphone-iphone/Classes/LinphoneUI
Jehan Monnier 0ad82b4cff Merge remote-tracking branch 'private/dev_videoios'
Conflicts:
	.gitmodules
	Classes/LinphoneAppDelegate.m
	Settings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	submodules/build/builder-iphone-os.mk
	submodules/liblinphone.xcodeproj/project.pbxproj
	submodules/linphone
2011-11-15 10:54:56 +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 remote-tracking branch 'public/master' into dev_videoios 2011-11-01 22:20:12 +01:00
LinphoneManager.m Merge remote-tracking branch 'private/dev_videoios' 2011-11-15 10:54:56 +01:00
LinphoneUIDelegates.h Merge remote-tracking branch 'public/master' into dev_videoios 2011-11-01 22:20:12 +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 mistake in license notice. 2011-08-12 17:54:29 +02:00
UICallButton.h fix mistake in license notice. 2011-08-12 17:54:29 +02:00
UICallButton.m fix mistake in license notice. 2011-08-12 17:54:29 +02: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 fix mistake in license notice. 2011-08-12 17:54:29 +02:00
UIDigitButton.m fix mistake in license notice. 2011-08-12 17:54:29 +02: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 fix mistake in license notice. 2011-08-12 17:54:29 +02: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 Pause SIP call when audio is interrupted by OS (on incoming GSM call for instance) 2011-10-24 11:46:20 +02:00
UISpeakerButton.h fix mistake in license notice. 2011-08-12 17:54:29 +02:00
UISpeakerButton.m fix mistake in license notice. 2011-08-12 17:54:29 +02:00
UIToggleButton.h fix mistake in license notice. 2011-08-12 17:54:29 +02:00
UIToggleButton.m fix mistake in license notice. 2011-08-12 17:54:29 +02:00