Ondrej Zajicek 6477b8f10c Merge commit 'c6964c305b425b98aaf0492806a28b578d799d83' into integrated ...

Conflicts:

	sysdep/bsd/krt-sock.c
	sysdep/linux/netlink.c
	sysdep/unix/krt.h

2013-07-31 17:39:16 +02:00

..

krt-sock.c

Merge commit 'c6964c305b425b98aaf0492806a28b578d799d83' into integrated

2013-07-31 17:39:16 +02:00

krt-sys.h

Merge commit 'c6964c305b425b98aaf0492806a28b578d799d83' into integrated

2013-07-31 17:39:16 +02:00

Modules

Cleanup in sysdep KRT code, part 2.

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

sysio.h

Merge commit '6ac4f87a2d661c739e55a63577e7bccf696c7abd' into integrated

2013-07-31 16:29:34 +02:00