linphone-iphone/linphone.xcodeproj
Yann Diorcet 6fb1e958e5 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into castel
Conflicts:
	Classes/LinphoneAppDelegate.m
	Classes/LinphoneUI/UICallBar.m
2012-08-09 14:43:11 +02:00
..
project.pbxproj Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into castel 2012-08-09 14:43:11 +02:00