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

1 commit

Author SHA1 Message Date
Yann Diorcet
233f22e5d7 Merge branch 'master' into tunnel 
Conflicts:
	Classes/LinphoneUI/LinphoneManager.h
	Classes/LinphoneUI/LinphoneManager.m
	Settings.bundle/Root.plist
	Settings/InAppSettings.bundle/Root.plist
	linphone.xcodeproj/project.pbxproj
	submodules/build/builders.d/x264.mk
 2013-01-15 12:58:42 +01:00