Ondrej Zajicek 6c58962611 Merge commit 'd40c26594c22ad934a13061e11b373bdf81af8f9' into integrated ... Conflicts: proto/static/static.c		2014-05-02 18:13:20 +02:00
..
bfd	Merge branch 'add-path'	2014-02-06 20:15:05 +01:00
bgp	Merge commit '5c200e0a4d26d183e04fda43de16340521002c40' into integrated	2014-05-02 17:41:45 +02:00
ospf	Merge commit '10c2e1e0125dfa600b1c2b6553883cccf2d025dd' into integrated	2014-05-02 17:18:36 +02:00
pipe	Merge branch 'master' into add-path	2013-11-23 11:50:34 +01:00
radv	Merge commit '48e5f32db676645640f84ab3d630cce975aa6b20' into integrated	2014-05-02 17:05:23 +02:00
rip	Merge commit '48e5f32db676645640f84ab3d630cce975aa6b20' into integrated	2014-05-02 17:05:23 +02:00
static	Merge commit 'd40c26594c22ad934a13061e11b373bdf81af8f9' into integrated	2014-05-02 18:13:20 +02:00
Doc	Initial BFD commit, work in progress.	2013-09-10 12:09:36 +02:00