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

..

attrs.c

Merge commit 'f48fa14214301382b2e6b134788a7506b61b664f' into integrated

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

bgp.c

Merge branch 'add-path'

2013-12-10 22:30:46 +01:00

bgp.h

Merge branch 'master' into add-path

2013-11-23 11:50:34 +01:00

config.Y

Merge branch 'master' into add-path

2013-11-25 18:42:47 +01:00

Doc

BGP documented.

2000-06-04 17:06:18 +00:00

Makefile

Construction of BGP packets.

2000-03-21 15:53:50 +00:00

packets.c

Merge commit 'f48fa14214301382b2e6b134788a7506b61b664f' into integrated

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