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

projects / tinc / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4ce4af4 4766359)

author	Guus Sliepen <guus@tinc-vpn.org>
	Sat, 17 Apr 2010 10:21:53 +0000 (12:21 +0200)
committer	Guus Sliepen <guus@tinc-vpn.org>
	Sat, 17 Apr 2010 10:21:53 +0000 (12:21 +0200)
commit	79e46d08a46f2fef2ee4e8eac7ba487007160564
tree	93ee6e8e0eab1b47ddc5a4ef80d54c67765ca6f5	tree \| snapshot
parent	4ce4af4c712c80d08630767ec34787253da1021b	commit \| diff
parent	4766359e1426bdf1383c898d6103d8760e5e296d	commit \| diff

Merge branch 'master' into 1.1

Conflicts:
NEWS
README
configure.in
src/net.c
src/net.h

12 files changed:

NEWS	diff1 \|	diff2 \|	blob \| history
doc/tinc.texi	diff1 \|	diff2 \|	blob \| history
src/conf.c	diff1 \|	diff2 \|	blob \| history
src/ipv4.h	diff1 \|	diff2 \|	blob \| history
src/ipv6.h	diff1 \|	diff2 \|	blob \| history
src/net.c	diff1 \|	diff2 \|	blob \| history
src/net.h	diff1 \|	diff2 \|	blob \| history
src/net_setup.c	diff1 \|	diff2 \|	blob \| history
src/netutl.c	diff1 \|	diff2 \|	blob \| history
src/protocol_auth.c	diff1 \|	diff2 \|	blob \| history
src/route.c	diff1 \|	diff2 \|	blob \| history
src/subnet.h	diff1 \|	diff2 \|	blob \| history

tinc, the VPN daemon