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

..

auth.c

Temporary integrated commit (RIP).

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

config.Y

Merge commit 'ef4a50be10c6dd0abffd957132cd146029c3d79d' into integrated

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

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

rip.h

Merge commit 'ef4a50be10c6dd0abffd957132cd146029c3d79d' into integrated

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