Yann Diorcet 7d208de9c1 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone ... Conflicts: linphone.xcodeproj/project.pbxproj		2012-07-23 09:10:48 +02:00
..
project.pbxproj	Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone	2012-07-23 09:10:48 +02:00