0
0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-03-18 20:37:05 +00:00
Ondrej Zajicek 6abc22f4b0 Merge commit '6ac4f87a2d661c739e55a63577e7bccf696c7abd' into integrated
Conflicts:

	lib/socket.h
	proto/ospf/config.Y
	proto/ospf/iface.c
	proto/ospf/ospf.h
	proto/rip/rip.c
	sysdep/bsd/sysio.h
	sysdep/linux/sysio.h
	sysdep/unix/io.c
2013-07-31 16:29:34 +02:00
..
2013-04-16 01:14:57 +02:00
2009-08-21 09:27:52 +02:00
Doc
2000-06-07 23:23:37 +00:00
2009-08-21 09:27:52 +02:00
2013-06-28 01:01:21 +02:00
2013-04-16 01:14:57 +02:00
2009-08-21 09:27:52 +02:00
2013-06-28 01:01:21 +02:00
2013-04-16 01:14:57 +02:00
2013-04-16 01:14:57 +02:00
2012-06-23 10:13:32 +02:00
2013-06-28 01:01:21 +02:00