Commit graph

3 commits

Author SHA1 Message Date
Simon Morlat
fd98c1e057 - do not register outside of tunnel when tunnel is activated but not yet connected.
- move TUNNEL_ENABLED to config.h, which avoids recompilation issues with -D flags.
2013-05-10 15:07:01 +02:00
Yann Diorcet
35d65d36f2 Merge branch 'master' of git.linphone.org:linphone into upnp
Conflicts:
	coreapi/linphone_tunnel.cc
	mediastreamer2
2013-01-17 15:34:58 +01:00
Yann Diorcet
9898c4beec Fix static build split tunnel stubs 2012-12-20 17:34:36 +01:00