Commit graph

3 commits

Author SHA1 Message Date
Simon Morlat
c4cf58931e rework TunnelConfig java wrapper to make it state of art and in the public interfaces. 2015-10-27 18:41:36 +01:00
Simon Morlat
e39a90c1dd make LinphoneTunnelConfig a real object 2015-10-27 14:49:29 +01: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