Commit graph

2 commits

Author SHA1 Message Date
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