Simon Morlat
81ce1181b4
restore tunnel build, fix crash occuring with lastest polarssl
2014-04-22 23:37:46 +02:00
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
68bb10b55e
restore tunnel submodule in submodules/, update linphone submodule, update exosip
2012-01-31 13:42:33 +01:00
Guillaume Beraudo
8d81fc2ba1
Multi call / conference tunnel support.
2011-12-20 18:12:40 +01:00
Jehan Monnier
1f687ef981
Merge remote-tracking branch 'bc/master' into tunnel
...
Conflicts:
linphone.xcodeproj/project.pbxproj
submodules/build/Makefile
2011-06-17 10:13:20 +02:00
Jehan Monnier
0a59882bcd
remove ssl compilation from exosip
2011-04-12 10:00:06 +02:00
Jehan Monnier
a0f30669db
implement tunnel
2011-03-17 12:36:25 +01:00