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

..

krt-sys.h

Cleanup in sysdep KRT code, part 4.

2012-05-04 16:38:25 +02:00

Modules

Cleanup in sysdep KRT code, part 2.

2012-04-30 22:25:24 +02:00

netlink.c

Merge commit '924868543c2010f3ef2cfcb7ba6bac5988ab3264' into integrated

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

netlink.Y

Cleanup in sysdep KRT code, part 4.

2012-05-04 16:38:25 +02:00

sysio.h

Merge commit 'ef4a50be10c6dd0abffd957132cd146029c3d79d' into integrated

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

syspriv.h

Handles missing macro.

2011-07-29 14:52:28 +02:00