linphone-iphone/linphone.xcodeproj
Yann Diorcet 23ff2e3681 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into castel
Conflicts:
	Classes/ContactDetailsTableViewController.m
	Classes/LinphoneManager.h
	Classes/LinphoneManager.m
	linphone.xcodeproj/project.pbxproj
2012-08-14 09:45:25 +02:00
..
project.pbxproj Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into castel 2012-08-14 09:45:25 +02:00