git.tinc-vpn.org Git - tinc/commit

author	Guus Sliepen <guus@tinc-vpn.org>
	Sun, 25 Mar 2012 22:35:31 +0000 (23:35 +0100)
committer	Guus Sliepen <guus@tinc-vpn.org>
	Sun, 25 Mar 2012 22:35:31 +0000 (23:35 +0100)
commit	86c2990327fdf7ec1197aa73cb2b9a926a734db4
tree	6b06c1baa29ab29d62d2500e263d0f77ff422746	tree \| snapshot
parent	d7bf63c63ab397cf3e5ca4a065922364925788e7	commit \| diff
parent	b23681dddb8987571f04d46fc14f0ba012a7929c	commit \| diff

Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Conflicts:
NEWS
README
configure.in
src/Makefile.am
src/conf.c
src/conf.h
src/connection.c
src/net.c
src/tincd.c

29 files changed:

NEWS	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
doc/tinc.conf.5.in	diff1 \|	diff2 \|	blob \| history
doc/tinc.texi	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	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/connection.h	diff1 \|	diff2 \|	blob \| history
src/device.h	diff1 \|	diff2 \|	blob \| history
src/graph.c	diff1 \|	diff2 \|	blob \| history
src/ipv4.h	diff1 \|	diff2 \|	blob \| history
src/ipv6.h	diff1 \|	diff2 \|	blob \| history
src/multicast_device.c	\|	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/node.h	diff1 \|	diff2 \|	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/protocol_misc.c	diff1 \|	diff2 \|	blob \| history
src/route.c	diff1 \|	diff2 \|	blob \| history
src/route.h	diff1 \|	diff2 \|	blob \| history
src/subnet.c	diff1 \|	diff2 \|	blob \| history
src/tincd.c	diff1 \|	diff2 \|	blob \| history
src/vde_device.c	diff1 \|	diff2 \|	blob \| history

tinc, the VPN daemon

RSS Atom

NEWS	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
doc/tinc.conf.5.in	diff1 \|	diff2 \|	blob \| history
doc/tinc.texi	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	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/connection.h	diff1 \|	diff2 \|	blob \| history
src/device.h	diff1 \|	diff2 \|	blob \| history
src/graph.c	diff1 \|	diff2 \|	blob \| history
src/ipv4.h	diff1 \|	diff2 \|	blob \| history
src/ipv6.h	diff1 \|	diff2 \|	blob \| history
src/multicast_device.c	\|	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/node.h	diff1 \|	diff2 \|	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/protocol_misc.c	diff1 \|	diff2 \|	blob \| history
src/route.c	diff1 \|	diff2 \|	blob \| history
src/route.h	diff1 \|	diff2 \|	blob \| history
src/subnet.c	diff1 \|	diff2 \|	blob \| history
src/tincd.c	diff1 \|	diff2 \|	blob \| history
src/vde_device.c	diff1 \|	diff2 \|	blob \| history