j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity
tinc/src
History
Guus Sliepen 7ea85043ac Merge branch 'master' into 1.1 
Conflicts:
	NEWS
	configure.in
	lib/Makefile.am
	lib/pidfile.c
	lib/pidfile.h
	lib/utils.c
	po/POTFILES.in
	po/nl.po
	src/Makefile.am
	src/bsd/device.c
	src/conf.c
	src/connection.c
	src/cygwin/device.c
	src/edge.c
	src/event.c
	src/graph.c
	src/linux/device.c
	src/meta.c
	src/mingw/device.c
	src/net.c
	src/net_packet.c
	src/net_setup.c
	src/net_socket.c
	src/netutl.c
	src/node.c
	src/process.c
	src/protocol.c
	src/protocol_auth.c
	src/protocol_edge.c
	src/protocol_key.c
	src/protocol_misc.c
	src/protocol_subnet.c
	src/raw_socket/device.c
	src/route.c
	src/solaris/device.c
	src/subnet.c
	src/tincd.c
	src/uml_socket/device.c
2009-09-29 14:55:29 +02:00
..
bsd Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
cygwin Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
gcrypt Move RSA key generation into the wrappers. 2008-12-14 12:47:26 +00:00
linux Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
mingw Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
openssl Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
raw_socket Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
solaris Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
uml_socket Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
conf.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
conf.h Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
connection.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
connection.h Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
control.c Remove unnecessary parentheses from sizeof, apply sizeof to variables instead of types whereever possible. 2008-12-11 15:56:18 +00:00
control.h Remove pidfile in favour of control socket. 2007-05-19 14:13:21 +00:00
control_common.h Use a control socket directory to restrict access 2007-11-08 19:18:44 +00:00
device.h Update the address of the Free Software Foundation in all copyright headers. 2009-09-25 00:01:00 +02:00
edge.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
edge.h Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
graph.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
graph.h Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
logger.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
logger.h Synchronise HEAD with CABAL branch. 2003-08-24 20:38:31 +00:00
Makefile.am Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
meta.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
meta.h Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
net.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
net.h Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
net_packet.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
net_setup.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
net_socket.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
netutl.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
netutl.h Update the address of the Free Software Foundation in all copyright headers. 2009-09-25 00:01:00 +02:00
node.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
node.h Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
process.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
process.h Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
protocol.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
protocol.h Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
protocol_auth.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
protocol_edge.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
protocol_key.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
protocol_misc.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
protocol_subnet.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
route.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
route.h Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
subnet.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
subnet.h Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00
tincctl.c Replace asprintf()s not covered by the merge to xasprintf(). 2009-09-16 20:28:30 +02:00
tincd.c Merge branch 'master' into 1.1 2009-09-29 14:55:29 +02:00