Commit graph

2 commits

Author SHA1 Message Date
Yann Diorcet
4e5066034b Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone
Conflicts:
	Classes/InCallViewController.m
	Classes/IncomingCallViewController.xib
	Classes/LinphoneUI/UICallBar.m
	Classes/LinphoneUI/UICallBar.xib
	Classes/LinphoneUI/UIMainBar.m
	linphone.xcodeproj/project.pbxproj
	submodules/linphone
2012-08-06 15:32:48 +02:00
Yann Diorcet
f7e5dd96db Continue iPad version 2012-07-30 17:57:15 +02:00