mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-04-24 09:28:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
linphone-iphone/linphone.xcodeproj
History
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
..
project.pbxproj Merge remote-tracking branch 'origin/conference' 2011-11-18 17:18:49 +01:00