0
0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 17:51:53 +00:00
bird/proto
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
..
bgp Merge commit '924868543c2010f3ef2cfcb7ba6bac5988ab3264' into integrated 2013-07-30 21:34:47 +02:00
ospf Merge commit '6ac4f87a2d661c739e55a63577e7bccf696c7abd' into integrated 2013-07-31 16:29:34 +02:00
pipe Separate import and receive limits. 2013-01-10 13:07:33 +01:00
radv Merge commit '4c2abee74e64f64fba61aad6e2b66e3895820003' into integrated 2013-05-22 15:46:29 +02:00
rip Merge commit '6ac4f87a2d661c739e55a63577e7bccf696c7abd' into integrated 2013-07-31 16:29:34 +02:00
static Merge commit '4c2abee74e64f64fba61aad6e2b66e3895820003' into integrated 2013-05-22 15:46:29 +02:00
Doc Implements Router Advertisement protocol. 2011-03-13 11:33:50 +01:00