mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-27 07:59:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
580 commits 25 branches 117 tags 149 MiB
Commit graph

1 commit

Author SHA1 Message Date
Yann Diorcet
44e438ab33 Merge branch 'inappsettings' into new_ui 
Conflicts:
	Classes/FirstLoginViewController.m
	Classes/InCallViewController.m
	Classes/LinphoneAppDelegate.h
	Classes/LinphoneAppDelegate.m
	Classes/LinphoneUI/LinphoneManager.h
	Classes/LinphoneUI/LinphoneManager.m
	Classes/MainScreenWithVideoPreview.m
	Classes/PhoneViewController.m
	PhoneMainView.xib
	linphone.xcodeproj/project.pbxproj
 2012-06-22 18:30:18 +02:00