witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity
linphone-ios/linphone.xcodeproj
History
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
..
project.pbxproj Merge branch 'new_ui' of git://git.linphone.org/linphone-iphone 2012-08-06 15:32:48 +02:00