Merge branch 'master' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Tue, 29 Sep 2009 12:55:29 +0000 (14:55 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Tue, 29 Sep 2009 12:55:29 +0000 (14:55 +0200)
commit7ea85043ac1fb2096baea44f6b0af27ac0d0b2cf
tree159513607ecba980546b71f4716a27ca115f7abd
parentf1fec466e232c00c668422014029dce9114d3add
parent9a2b0f88a9cae753ebc81c939d01403178b18a35
Merge branch 'master' into 1.1

Conflicts:
NEWS
configure.in
lib/Makefile.am
lib/pidfile.c
lib/pidfile.h
lib/utils.c
po/POTFILES.in
po/nl.po
src/Makefile.am
src/bsd/device.c
src/conf.c
src/connection.c
src/cygwin/device.c
src/edge.c
src/event.c
src/graph.c
src/linux/device.c
src/meta.c
src/mingw/device.c
src/net.c
src/net_packet.c
src/net_setup.c
src/net_socket.c
src/netutl.c
src/node.c
src/process.c
src/protocol.c
src/protocol_auth.c
src/protocol_edge.c
src/protocol_key.c
src/protocol_misc.c
src/protocol_subnet.c
src/raw_socket/device.c
src/route.c
src/solaris/device.c
src/subnet.c
src/tincd.c
src/uml_socket/device.c
49 files changed:
NEWS
configure.in
doc/tinc.texi
doc/tincd.8.in
have.h
lib/Makefile.am
lib/avl_tree.c
src/Makefile.am
src/bsd/device.c
src/conf.c
src/conf.h
src/connection.c
src/connection.h
src/cygwin/device.c
src/edge.c
src/edge.h
src/graph.c
src/graph.h
src/linux/device.c
src/logger.c
src/meta.c
src/meta.h
src/mingw/device.c
src/net.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/openssl/rsagen.h
src/process.c
src/process.h
src/protocol.c
src/protocol.h
src/protocol_auth.c
src/protocol_edge.c
src/protocol_key.c
src/protocol_misc.c
src/protocol_subnet.c
src/raw_socket/device.c
src/route.c
src/route.h
src/solaris/device.c
src/subnet.c
src/subnet.h
src/tincd.c
src/uml_socket/device.c