tinc-vpn.org Git - tinc/commit

author	Guus Sliepen <guus@sliepen.eu.org>
	Wed, 16 Sep 2009 17:55:47 +0000 (19:55 +0200)
committer	Guus Sliepen <guus@sliepen.eu.org>
	Wed, 16 Sep 2009 17:55:47 +0000 (19:55 +0200)
commit	075e6828a7533e7daa790225f17aa6bb39703278
tree	305f99273ab7806b090a7d7f708f300b70b5dcb3	tree \| snapshot
parent	9b129c07e273ae113f3c67a9feeee82e8146f3a1	commit \| diff
parent	b5ccce296848aab72d574ca3de14af5fdf3efa4d	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
have.h	diff1 \|	diff2 \|	blob \| history
lib/dropin.c	diff1 \|	diff2 \|	blob \| history
lib/fake-getaddrinfo.c	diff1 \|	diff2 \|	blob \| history
lib/fake-getnameinfo.c	diff1 \|	diff2 \|	blob \| history
lib/utils.c	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/bsd/device.c	diff1 \|	diff2 \|	blob \| history
src/conf.c	diff1 \|	diff2 \|	blob \| history
src/connection.c	diff1 \|	diff2 \|	blob \| history
src/connection.h	diff1 \|	diff2 \|	blob \| history
src/graph.c	diff1 \|	diff2 \|	blob \| history
src/meta.c	diff1 \|	diff2 \|	blob \| history
src/mingw/device.c	diff1 \|	diff2 \|	blob \| history
src/net.h	diff1 \|	diff2 \|	blob \| history
src/net_packet.c	diff1 \|	diff2 \|	blob \| history
src/net_setup.c	diff1 \|	diff2 \|	blob \| history
src/net_socket.c	diff1 \|	diff2 \|	blob \| history
src/netutl.c	diff1 \|	diff2 \|	blob \| history
src/node.c	diff1 \|	diff2 \|	blob \| history
src/node.h	diff1 \|	diff2 \|	blob \| history
src/process.c	diff1 \|	diff2 \|	blob \| history
src/protocol.c	diff1 \|	diff2 \|	blob \| history
src/protocol_edge.c	diff1 \|	diff2 \|	blob \| history
src/protocol_key.c	diff1 \|	diff2 \|	blob \| history
src/protocol_misc.c	diff1 \|	diff2 \|	blob \| history
src/protocol_subnet.c	diff1 \|	diff2 \|	blob \| history
src/route.c	diff1 \|	diff2 \|	blob \| history
src/solaris/device.c	diff1 \|	diff2 \|	blob \| history
src/subnet.c	diff1 \|	diff2 \|	blob \| history
src/tincctl.c	diff1 \|	\|	blob \| history
src/tincd.c	diff1 \|	diff2 \|	blob \| history
src/uml_socket/device.c	diff1 \|	diff2 \|	blob \| history

tinc, the VPN daemon

RSS Atom

configure.in	diff1 \|	diff2 \|	blob \| history
have.h	diff1 \|	diff2 \|	blob \| history
lib/dropin.c	diff1 \|	diff2 \|	blob \| history
lib/fake-getaddrinfo.c	diff1 \|	diff2 \|	blob \| history
lib/fake-getnameinfo.c	diff1 \|	diff2 \|	blob \| history
lib/utils.c	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/bsd/device.c	diff1 \|	diff2 \|	blob \| history
src/conf.c	diff1 \|	diff2 \|	blob \| history
src/connection.c	diff1 \|	diff2 \|	blob \| history
src/connection.h	diff1 \|	diff2 \|	blob \| history
src/graph.c	diff1 \|	diff2 \|	blob \| history
src/meta.c	diff1 \|	diff2 \|	blob \| history
src/mingw/device.c	diff1 \|	diff2 \|	blob \| history
src/net.h	diff1 \|	diff2 \|	blob \| history
src/net_packet.c	diff1 \|	diff2 \|	blob \| history
src/net_setup.c	diff1 \|	diff2 \|	blob \| history
src/net_socket.c	diff1 \|	diff2 \|	blob \| history
src/netutl.c	diff1 \|	diff2 \|	blob \| history
src/node.c	diff1 \|	diff2 \|	blob \| history
src/node.h	diff1 \|	diff2 \|	blob \| history
src/process.c	diff1 \|	diff2 \|	blob \| history
src/protocol.c	diff1 \|	diff2 \|	blob \| history
src/protocol_edge.c	diff1 \|	diff2 \|	blob \| history
src/protocol_key.c	diff1 \|	diff2 \|	blob \| history
src/protocol_misc.c	diff1 \|	diff2 \|	blob \| history
src/protocol_subnet.c	diff1 \|	diff2 \|	blob \| history
src/route.c	diff1 \|	diff2 \|	blob \| history
src/solaris/device.c	diff1 \|	diff2 \|	blob \| history
src/subnet.c	diff1 \|	diff2 \|	blob \| history
src/tincctl.c	diff1 \|	\|	blob \| history
src/tincd.c	diff1 \|	diff2 \|	blob \| history
src/uml_socket/device.c	diff1 \|	diff2 \|	blob \| history