Yann Diorcet 9be0706cb2 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into castel ... Conflicts: linphone.xcodeproj/project.pbxproj		2012-08-09 16:54:33 +02:00
..
project.pbxproj	Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into castel	2012-08-09 16:54:33 +02:00