7 commits

Author	SHA1	Message	Date
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
Simon Morlat	8fac0fa65e	update openssl	2012-09-26 22:46:07 +02:00
Jehan Monnier	8a1c3000cd	merge vios IOS with master	2011-11-18 14:23:41 +01:00
Guillaume Beraudo	c288f87bfb	Patches for srtp and zrtp.	2011-09-06 14:51:14 +02:00
Jehan Monnier	13399e424a	migrate liblinphone sdk compilation to xcode4	2011-03-23 14:01:05 +01:00
Jehan Monnier	661853b70a	fix openssl build	2011-03-18 20:55:06 +01:00
Jehan Monnier	b558703c8f	add build script for open ssl	2011-03-18 20:18:34 +01:00