linphone-ios/linphone.xcodeproj
Yann Diorcet 884f411cd7 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone
Conflicts:
	Classes/InCallViewController.m
2012-07-13 17:30:50 +02:00
..
project.pbxproj Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone 2012-07-13 17:30:50 +02:00