Commit graph

5 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
Jehan Monnier
edf9cda3a3 implement lanscape mode for IOS video 2011-09-19 17:13:16 +02:00
Jehan Monnier
d73efa6d9c enable front cam 2011-07-21 16:40:54 +02:00
Jehan Monnier
6c7e64958a enable preview 2011-07-13 18:21:40 +02:00
Jehan Monnier
09640da0c0 start video integration 2011-07-08 18:06:50 +02:00