0
0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-03-13 09:57:02 +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
..
2009-05-11 01:32:49 +02:00
2012-06-23 15:17:50 +02:00
2012-04-30 15:31:32 +02:00
2012-04-30 22:25:24 +02:00