Commit graph

6 commits

Author SHA1 Message Date
Simon Morlat
eecb65d1d4 Merge remote-tracking branch 'public/master' into dev_videoios
Conflicts:
	Classes/LinphoneUI/LinphoneManager.m
	Classes/LinphoneUI/LinphoneUIDelegates.h
	Classes/LinphoneUI/UILinphone.h
	Settings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	linphonerc
	submodules/build/builder-iphone-os.mk
	submodules/liblinphone.xcodeproj/project.pbxproj
2011-11-01 22:20:12 +01:00
Pierre-Eric Pelloux-Prayer
fc530ed057 Pause SIP call when audio is interrupted by OS (on incoming GSM call for instance)
The SIP call is automatically resumed when audio is available.
2011-10-24 11:46:20 +02:00
Simon Morlat
da9ec193d5 Merge branch 'master' into dev_videoios
Conflicts:
	linphone.xcodeproj/project.pbxproj
	submodules/build/builder-iphone-os.mk
	submodules/linphone
2011-08-20 12:35:07 +02:00
Simon Morlat
54685cd81a fix mistake in license notice. 2011-08-12 17:54:29 +02:00
Jehan Monnier
09640da0c0 start video integration 2011-07-08 18:06:50 +02:00
Jehan Monnier
57ff6ba06f add FirtLoginView 2011-02-04 14:06:59 +01:00
Renamed from Classes/LinphoneUI/LinphoneUIControler.h (Browse further)