Guus Sliepen 3fba80174d Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1 ... Conflicts: NEWS README configure.in doc/tincd.8.in src/Makefile.am src/bsd/device.c src/connection.c src/connection.h src/cygwin/device.c src/device.h src/dropin.h src/linux/device.c src/mingw/device.c src/net.c src/net_packet.c src/net_setup.c src/net_socket.c src/process.c src/protocol.c src/protocol_key.c src/raw_socket_device.c src/route.c src/solaris/device.c src/tincd.c src/uml_device.c		2012-02-22 14:23:59 +01:00
..
device.c	Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1	2012-02-22 14:23:59 +01:00