Guus Sliepen 79e46d08a4 Merge branch 'master' into 1.1 ... Conflicts: NEWS README configure.in src/net.c src/net.h		2010-04-17 12:21:53 +02:00
..
sample-config	Synchronise HEAD with CABAL branch.	2003-08-24 20:38:31 +00:00
CONNECTIVITY	Remove all occurences of $Id$.	2009-09-24 23:39:16 +02:00
Makefile.am	Apply patch from Scott Lamb: Update documentation to match tincctl changes	2007-09-04 15:06:35 +00:00
NETWORKING	Remove all occurences of $Id$.	2009-09-24 23:39:16 +02:00
PROTOCOL	Remove all occurences of $Id$.	2009-09-24 23:39:16 +02:00
SECURITY2	Remove all occurences of $Id$.	2009-09-24 23:39:16 +02:00
tinc.conf.5.in	Mark Forwarding and DirectOnly options as being experimental.	2010-04-11 19:47:44 +02:00
tinc.texi	Merge branch 'master' into 1.1	2010-04-17 12:21:53 +02:00
tincctl.8.in	Reload configuration through control socket	2007-11-07 02:51:24 +00:00
tincd.8.in	Small updates to the documentation.	2009-10-11 15:46:52 +02:00
tincinclude.texi.in	Remove unused stuff from doc/.	2003-08-08 14:07:12 +00:00