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

author	Guus Sliepen <guus@tinc-vpn.org>
	Mon, 9 Mar 2009 18:02:24 +0000 (19:02 +0100)
committer	Guus Sliepen <guus@tinc-vpn.org>
	Mon, 9 Mar 2009 18:02:24 +0000 (19:02 +0100)
commit	08aabbf9317806bc50a9a6693ca866c8936ce26b
tree	cffb3736abbe50f952d8507d2e90eb6a863be2dc	tree \| snapshot
parent	551cd19406a560d0d206bff5b4e9da064ec222b6	commit \| diff
parent	43fa7283ac01f2ecc95381b519ef6b3342546f35	commit \| diff

Merge branch 'master' into 1.1

Conflicts:
NEWS
README
doc/tinc.conf.5.in
doc/tinc.texi
po/nl.po
src/conf.c
src/connection.c
src/event.c
src/graph.c
src/net.c
src/net_packet.c
src/net_socket.c
src/node.c
src/node.h
src/openssl/rsagen.h
src/protocol_auth.c
src/protocol_key.c
src/protocol_misc.c
src/subnet.c
src/subnet.h
src/tincd.c

30 files changed:

NEWS	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
doc/tinc.texi	diff1 \|	diff2 \|	blob \| history
src/bsd/device.c	diff1 \|	diff2 \|	blob \| history
src/conf.c	diff1 \|	diff2 \|	blob \| history
src/conf.h	diff1 \|	diff2 \|	blob \| history
src/connection.c	diff1 \|	diff2 \|	blob \| history
src/cygwin/device.c	diff1 \|	diff2 \|	blob \| history
src/graph.c	diff1 \|	diff2 \|	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.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/node.c	diff1 \|	diff2 \|	blob \| history
src/node.h	diff1 \|	diff2 \|	blob \| history
src/process.c	diff1 \|	diff2 \|	blob \| history
src/protocol_auth.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/raw_socket/device.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/subnet.h	diff1 \|	diff2 \|	blob \| history
src/tincd.c	diff1 \|	diff2 \|	blob \| history
src/uml_socket/device.c	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

NEWS	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
doc/tinc.texi	diff1 \|	diff2 \|	blob \| history
src/bsd/device.c	diff1 \|	diff2 \|	blob \| history
src/conf.c	diff1 \|	diff2 \|	blob \| history
src/conf.h	diff1 \|	diff2 \|	blob \| history
src/connection.c	diff1 \|	diff2 \|	blob \| history
src/cygwin/device.c	diff1 \|	diff2 \|	blob \| history
src/graph.c	diff1 \|	diff2 \|	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.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/node.c	diff1 \|	diff2 \|	blob \| history
src/node.h	diff1 \|	diff2 \|	blob \| history
src/process.c	diff1 \|	diff2 \|	blob \| history
src/protocol_auth.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/raw_socket/device.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/subnet.h	diff1 \|	diff2 \|	blob \| history
src/tincd.c	diff1 \|	diff2 \|	blob \| history
src/uml_socket/device.c	diff1 \|	diff2 \|	blob \| history