linphone-iphone/linphone.xcodeproj
Yann Diorcet 022ef3235e Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into castel
Conflicts:
	linphone.xcodeproj/project.pbxproj
2012-08-16 14:37:07 +02:00
..
project.pbxproj Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into castel 2012-08-16 14:37:07 +02:00