Ondrej Zajicek 9cf24ba8e7 Merge commit 'ef4a50be10c6dd0abffd957132cd146029c3d79d' into integrated ...

Conflicts:

	lib/ipv6.h
	nest/config.Y
	proto/ospf/config.Y
	proto/rip/rip.c
	sysdep/bsd/sysio.h
	sysdep/linux/sysio.h
	sysdep/unix/io.c

2013-07-30 23:48:07 +02:00

..

bgp

Merge commit '924868543c2010f3ef2cfcb7ba6bac5988ab3264' into integrated

2013-07-30 21:34:47 +02:00

ospf

Merge commit 'ef4a50be10c6dd0abffd957132cd146029c3d79d' into integrated

2013-07-30 23:48:07 +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 'ef4a50be10c6dd0abffd957132cd146029c3d79d' into integrated

2013-07-30 23:48:07 +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