]> git.meshlink.io Git - meshlink/commit - src/fake-getaddrinfo.h
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Tue, 26 Jun 2012 11:24:20 +0000 (13:24 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Tue, 26 Jun 2012 11:24:20 +0000 (13:24 +0200)
commit19be9cf7150858311f7898fa3fb525d692d02f64
tree1847e05d63548c6a81a7ee32e1fbef58ee9fcc8e
parent62b61a1b7c2382b1bade142b3a41a9b27c1fd40d
parent00e71ece25070dc919f9bc0696e4ff3a387360d0
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Conflicts:
NEWS
README
configure.in
lib/utils.c
src/linux/device.c
src/meta.c
src/net.h
src/net_setup.c
src/net_socket.c
src/protocol.c
src/protocol_auth.c
src/tincd.c
16 files changed:
NEWS
THANKS
doc/tinc.conf.5.in
doc/tinc.texi
have.h
src/meta.c
src/net.h
src/net_packet.c
src/net_setup.c
src/net_socket.c
src/netutl.c
src/protocol.c
src/protocol_auth.c
src/route.c
src/route.h
src/utils.c