]> git.meshlink.io Git - meshlink/commit
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Thu, 23 Feb 2012 12:26:01 +0000 (13:26 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Thu, 23 Feb 2012 12:26:01 +0000 (13:26 +0100)
commitf5dc136cfd7a3a195b75f7174722734e25f30fd9
treef963665480f949e06935fc3955d166f8846089f7
parent3fba80174dbe29bcfe0d121a2a1d2e61be5ee57b
parent5a28aa7b8b0ab6237c2eab5f8b11253ea3ec5a05
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Conflicts:
src/net.c
src/net_packet.c
src/net_socket.c
doc/tinc.conf.5.in
doc/tinc.texi
src/graph.c
src/net.h
src/net_packet.c
src/net_setup.c
src/net_socket.c
src/node.h