Yann Diorcet 4f225b66a1 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone ... Conflicts: Classes/LinphoneUI/UICallBar.m Classes/LinphoneUI/UICallBar.xib linphone.xcodeproj/project.pbxproj		2012-07-25 09:56:32 +02:00
..
project.pbxproj	Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone	2012-07-25 09:56:32 +02:00