Yann Diorcet c83763a62a Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone ... Conflicts: Classes/LinphoneUI/UICallBar.xib Resources/call_state_outgoing_default.png Resources/call_state_ringing_default.png		2012-07-19 11:45:06 +02:00
..
project.pbxproj	Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone	2012-07-19 11:45:06 +02:00