Guillaume BIENKOWSKI 1ec60999ab Merge remote-tracking branch 'public/master' into tunnel ... Conflicts: Classes/LinphoneManager.h Classes/LinphoneManager.m linphone.xcodeproj/project.pbxproj submodules/build/Makefile submodules/build/builder-iphone-os.mk + Made modifications to the tunnel compilation so that it builds without openssl.		2013-11-05 10:54:23 +01:00
..
InAppSettings.bundle	Merge remote-tracking branch 'public/master' into tunnel	2013-11-05 10:54:23 +01:00