git.librecmc.org Git - oweals/tinc.git/commit

author	Guus Sliepen <guus@tinc-vpn.org>
	Wed, 22 Feb 2012 13:23:59 +0000 (14:23 +0100)
committer	Guus Sliepen <guus@tinc-vpn.org>
	Wed, 22 Feb 2012 13:23:59 +0000 (14:23 +0100)
commit	3fba80174dbe29bcfe0d121a2a1d2e61be5ee57b
tree	b8eb3cfe03858f4f6a29fb5ec17baf6e6717a61a	tree \| snapshot
parent	fba1c85f44edfc56c19d35332b1eb825179a8bb6	commit \| diff
parent	65e8e06c6dc7349b11c3c1e8f4071b51e2994c65	commit \| diff

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

31 files changed:

NEWS	diff1 \|	diff2 \|	blob \| history
THANKS	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
doc/tinc.conf.5.in	diff1 \|	diff2 \|	blob \| history
doc/tinc.texi	diff1 \|	diff2 \|	blob \| history
doc/tincd.8.in	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/bsd/device.c	diff1 \|	diff2 \|	blob \| history
src/connection.c	diff1 \|	diff2 \|	blob \| history
src/connection.h	diff1 \|	diff2 \|	blob \| history
src/cygwin/device.c	diff1 \|	diff2 \|	blob \| history
src/device.h	diff1 \|	diff2 \|	blob \| history
src/ipv4.h	diff1 \|	\|	blob \| history
src/linux/device.c	diff1 \|	diff2 \|	blob \| history
src/mingw/device.c	diff1 \|	diff2 \|	blob \| history
src/net.c	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/node.h	diff1 \|	diff2 \|	blob \| history
src/openssl/prf.c	diff1 \|	\|	blob \| history
src/protocol.c	diff1 \|	diff2 \|	blob \| history
src/protocol_auth.c	diff1 \|	diff2 \|	blob \| history
src/protocol_edge.c	diff1 \|	diff2 \|	blob \| history
src/protocol_key.c	diff1 \|	diff2 \|	blob \| history
src/raw_socket_device.c	\|	diff2 \|	blob \| history
src/route.c	diff1 \|	diff2 \|	blob \| history
src/route.h	diff1 \|	diff2 \|	blob \| history
src/solaris/device.c	diff1 \|	diff2 \|	blob \| history
src/tincd.c	diff1 \|	diff2 \|	blob \| history
src/uml_device.c	\|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

NEWS	diff1 \|	diff2 \|	blob \| history
THANKS	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
doc/tinc.conf.5.in	diff1 \|	diff2 \|	blob \| history
doc/tinc.texi	diff1 \|	diff2 \|	blob \| history
doc/tincd.8.in	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/bsd/device.c	diff1 \|	diff2 \|	blob \| history
src/connection.c	diff1 \|	diff2 \|	blob \| history
src/connection.h	diff1 \|	diff2 \|	blob \| history
src/cygwin/device.c	diff1 \|	diff2 \|	blob \| history
src/device.h	diff1 \|	diff2 \|	blob \| history
src/ipv4.h	diff1 \|	\|	blob \| history
src/linux/device.c	diff1 \|	diff2 \|	blob \| history
src/mingw/device.c	diff1 \|	diff2 \|	blob \| history
src/net.c	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/node.h	diff1 \|	diff2 \|	blob \| history
src/openssl/prf.c	diff1 \|	\|	blob \| history
src/protocol.c	diff1 \|	diff2 \|	blob \| history
src/protocol_auth.c	diff1 \|	diff2 \|	blob \| history
src/protocol_edge.c	diff1 \|	diff2 \|	blob \| history
src/protocol_key.c	diff1 \|	diff2 \|	blob \| history
src/raw_socket_device.c	\|	diff2 \|	blob \| history
src/route.c	diff1 \|	diff2 \|	blob \| history
src/route.h	diff1 \|	diff2 \|	blob \| history
src/solaris/device.c	diff1 \|	diff2 \|	blob \| history
src/tincd.c	diff1 \|	diff2 \|	blob \| history
src/uml_device.c	\|	diff2 \|	blob \| history