Commit graph

1 commit

Author SHA1 Message Date
Yann Diorcet
965499cad0 Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone into castel
Conflicts:
	Classes/ContactDetailsTableViewController.m
	castel-Info.plist
	linphone.xcodeproj/project.pbxproj
2012-08-09 12:17:55 +02:00