Guus Sliepen 86c2990327 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		2012-03-25 23:35:31 +01:00
..
sample-config	Simplify logging, update copyrights and some minor cleanups.	2003-07-12 17:41:48 +00:00
CONNECTIVITY	Remove all occurences of $Id$.	2009-09-24 23:39:16 +02:00
Makefile.am	Add manpage for tinc-gui.	2011-06-26 13:17:50 +02: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
SPTPS	Make sure the signature also covers the session label.	2012-03-18 21:24:46 +01:00
tinc-gui.8.in	Add manpage for tinc-gui.	2011-06-26 13:17:50 +02:00
tinc.conf.5.in	Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1	2012-03-25 23:35:31 +01:00
tinc.texi	Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1	2012-03-25 23:35:31 +01:00
tincctl.8.in	Allow log messages to be captured by tincctl.	2012-02-26 18:37:36 +01:00
tincd.8.in	Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1	2012-02-22 14:23:59 +01:00
tincinclude.texi.in	Remove unused stuff from doc/.	2003-08-08 14:07:12 +00:00