Ondrej Zajicek a485fd2909 Merge commit 'f48fa14214301382b2e6b134788a7506b61b664f' into integrated ...

Conflicts:

	nest/rt-table.c
	proto/bgp/attrs.c
	proto/bgp/packets.c
	proto/ospf/ospf.c
	proto/rip/rip.c
	proto/static/static.c
	sysdep/unix/krt.c

2014-04-29 17:23:38 +02:00

..

config.Y

Merge commit '2b3d52aa421ae1c31e30107beefd82fddbb42854' into integrated

2014-04-29 16:25:09 +02:00

dbdes.c

Temporary OSPF commit.

2013-04-16 01:14:57 +02:00

dbdes.h

Temporary OSPFv3 development commit

2009-08-21 09:27:52 +02:00

Doc

Doc.

2000-06-07 23:23:37 +00:00

hello.c

Merge commit 'e550a37206528be39e4751865b46720885fd64ed' into integrated

2014-04-29 13:52:01 +02:00

hello.h

Removes timers for stub interfaces. Also fixes some minor bugs.

2011-07-08 01:14:52 +02:00

iface.c

Merge commit '0bb4e37db317a1290bad24fe430cac6569a9bd8c' into integrated

2014-04-29 16:32:08 +02:00

iface.h

Temporary integrated commit (OSPF), unfinished.

2012-10-19 16:26:51 +02:00

lsack.c

Temporary integrated commit (OSPF), unfinished.

2012-10-02 11:44:05 +02:00

lsack.h

Temporary OSPFv3 development commit

2009-08-21 09:27:52 +02:00

lsalib.c

Temporary OSPF commit.

2013-06-28 01:01:21 +02:00

lsalib.h

Temporary integrated commit (OSPF), unfinished.

2012-10-02 11:44:05 +02:00

lsreq.c

Temporary OSPF commit.

2013-04-16 01:14:57 +02:00

lsreq.h

Temporary OSPFv3 development commit

2009-08-21 09:27:52 +02:00

lsupd.c

Merge commit '1fba34a7a1e245f08212a31a65030230da8c451d' into integrated

2014-04-29 16:24:59 +02:00

lsupd.h

Temporary OSPF commit.

2013-04-16 01:14:57 +02:00

Makefile

Routing table calculation. Dijkstra done.

2000-04-26 12:54:23 +00:00

neighbor.c

Merge commit '0aeac9cb7f9887374ce0258c8653f9518529bf08' into integrated

2014-04-29 16:17:09 +02:00

neighbor.h

BFD protocol, ready for release.

2013-11-19 22:33:48 +01:00

ospf.c

Merge commit 'f48fa14214301382b2e6b134788a7506b61b664f' into integrated

2014-04-29 17:23:38 +02:00

ospf.h

Temporary OSPF commit.

2014-04-29 12:18:10 +02:00

packet.c

Merge commit '6ac4f87a2d661c739e55a63577e7bccf696c7abd' into integrated

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

packet.h

Temporary integrated commit (OSPF), unfinished.

2012-10-19 16:26:51 +02:00

rt.c

Merge commit 'f48fa14214301382b2e6b134788a7506b61b664f' into integrated

2014-04-29 17:23:38 +02:00

rt.h

Temporary integrated commit.

2012-06-23 10:13:32 +02:00

topology.c

Merge commit '6a8d3f1c1ffbd964e4d11b452c73e1ea70310af3' into integrated

2014-04-29 13:00:14 +02:00

topology.h

Temporary OSPF commit.

2013-06-28 01:01:21 +02:00