linphone-iphone/linphone.xcodeproj
Yann Diorcet f2a5300143 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone
Conflicts:
	Classes/LinphoneUI/UILinphone.h
	Resources/dialer_alt_back_default_landscape.png
	Resources/dialer_alt_back_over_landscape.png
	linphone.xcodeproj/project.pbxproj
2012-07-27 11:36:20 +02:00
..
project.pbxproj Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone 2012-07-27 11:36:20 +02:00