]> git.meshlink.io Git - meshlink/commit - src/net_socket.c
Merge branch 'master' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Sat, 17 Apr 2010 10:21:53 +0000 (12:21 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Sat, 17 Apr 2010 10:21:53 +0000 (12:21 +0200)
commit79e46d08a46f2fef2ee4e8eac7ba487007160564
tree93ee6e8e0eab1b47ddc5a4ef80d54c67765ca6f5
parent4ce4af4c712c80d08630767ec34787253da1021b
parent4766359e1426bdf1383c898d6103d8760e5e296d
Merge branch 'master' into 1.1

Conflicts:
NEWS
README
configure.in
src/net.c
src/net.h
12 files changed:
NEWS
doc/tinc.texi
src/conf.c
src/ipv4.h
src/ipv6.h
src/net.c
src/net.h
src/net_setup.c
src/netutl.c
src/protocol_auth.c
src/route.c
src/subnet.h