Ondrej Zajicek 736e143fa5 Merge branch 'master' into add-path ...

Conflicts:

	filter/filter.c
	nest/proto.c
	nest/rt-table.c
	proto/bgp/bgp.h
	proto/bgp/config.Y

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

..

bfd

Changes identifiers to avoid use of reserved ones.

2013-11-22 21:59:43 +01:00

bgp

Merge branch 'master' into add-path

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

ospf

Merge branch 'master' into add-path

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

pipe

Merge branch 'master' into add-path

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

radv

Changes identifiers to avoid use of reserved ones.

2013-11-22 21:59:43 +01:00

rip

Merge branch 'master' into add-path

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

static

Merge branch 'master' into add-path

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

Doc

Initial BFD commit, work in progress.

2013-09-10 12:09:36 +02:00