Commit graph

8 commits

Author SHA1 Message Date
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
Pierre-Eric Pelloux-Prayer
ec261bd518 Improved graphics/layout for incall view 2011-11-09 16:04:59 +01:00
Pierre-Eric Pelloux-Prayer
28f114cf29 Fix 'presentModelViewController' crash for iOS 5 with multicall 2011-11-08 15:18:10 +01:00
Pierre-Eric Pelloux-Prayer
8c8843d035 First multicall working version 2011-11-08 14:43:59 +01:00
Jehan Monnier
a77e2af47d fix missing call duration on outgoing calls 2011-11-04 12:20:53 +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
54685cd81a fix mistake in license notice. 2011-08-12 17:54:29 +02:00
Jehan Monnier
e005eddd92 fix IncallView
add advance view controller
2011-02-10 09:04:16 +01:00