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

..

auth.c

Temporary integrated commit (RIP).

2012-06-25 02:56:09 +02:00

config.Y

Merge commit '6ac4f87a2d661c739e55a63577e7bccf696c7abd' into integrated

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

Doc

Docs updates:

2000-06-05 16:36:16 +00:00

Makefile

Mensi updaty do ripu. Pridana passwd autentikace (netestovano).

1999-05-11 09:53:45 +00:00

rip.c

Merge commit '6ac4f87a2d661c739e55a63577e7bccf696c7abd' into integrated

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

rip.h

Merge commit '6ac4f87a2d661c739e55a63577e7bccf696c7abd' into integrated

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