]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge branch 'add-path'
authorOndrej Zajicek <santiago@crfreenet.org>
Thu, 6 Feb 2014 19:15:05 +0000 (20:15 +0100)
committerOndrej Zajicek <santiago@crfreenet.org>
Thu, 6 Feb 2014 19:15:05 +0000 (20:15 +0100)
1  2 
doc/bird.sgml
proto/bfd/bfd.c
proto/bgp/bgp.c

diff --cc doc/bird.sgml
Simple merge
diff --cc proto/bfd/bfd.c
Simple merge
diff --cc proto/bgp/bgp.c
Simple merge