]> git.meshlink.io Git - meshlink/commit - src/net_socket.c
Merge branch 'master' into 1.1
authorGuus Sliepen <guus@sliepen.eu.org>
Wed, 16 Sep 2009 17:55:47 +0000 (19:55 +0200)
committerGuus Sliepen <guus@sliepen.eu.org>
Wed, 16 Sep 2009 17:55:47 +0000 (19:55 +0200)
commit075e6828a7533e7daa790225f17aa6bb39703278
tree305f99273ab7806b090a7d7f708f300b70b5dcb3
parent9b129c07e273ae113f3c67a9feeee82e8146f3a1
parentb5ccce296848aab72d574ca3de14af5fdf3efa4d
Merge branch 'master' into 1.1

Conflicts:
have.h
lib/dropin.c
lib/fake-getaddrinfo.c
lib/pidfile.c
src/Makefile.am
src/bsd/device.c
src/conf.c
src/connection.c
src/connection.h
src/graph.c
src/mingw/device.c
src/net.c
src/net_setup.c
src/node.c
src/protocol_key.c
src/protocol_misc.c
src/tincd.c
33 files changed:
configure.in
have.h
lib/dropin.c
lib/fake-getaddrinfo.c
lib/fake-getnameinfo.c
lib/utils.c
src/Makefile.am
src/bsd/device.c
src/conf.c
src/connection.c
src/connection.h
src/graph.c
src/meta.c
src/mingw/device.c
src/net.h
src/net_packet.c
src/net_setup.c
src/net_socket.c
src/netutl.c
src/node.c
src/node.h
src/process.c
src/protocol.c
src/protocol_edge.c
src/protocol_key.c
src/protocol_misc.c
src/protocol_subnet.c
src/route.c
src/solaris/device.c
src/subnet.c
src/tincctl.c
src/tincd.c
src/uml_socket/device.c