witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity
5910 commits 24 branches 110 tags 140 MiB
Commit graph

2 commits

Author SHA1 Message Date
Gautier Pelloux-Prayer
ea272d6bdf tunnel: remove deprecated API calls 2016-04-08 11:23:51 +02:00
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