linphone-iphone/linphone.xcodeproj
Yann Diorcet 519df08e35 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone
Conflicts:
	Classes/LinphoneUI/UICallBar.xib
	linphone.xcodeproj/project.pbxproj
2012-07-26 11:24:15 +02:00
..
project.pbxproj Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone 2012-07-26 11:24:15 +02:00