]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
projects / thirdparty / bird.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5299fb9 692055e)
Merge commit '692055e3df6cc9f0d428d3b0dd8cdd8e825eb6f4' into haugesund-to-2.0
authorMaria Matejka <mq@ucw.cz>
Mon, 30 May 2022 13:17:52 +0000 (15:17 +0200)
committerMaria Matejka <mq@ucw.cz>
Mon, 30 May 2022 13:17:52 +0000 (15:17 +0200)
1  2 
doc/bird.sgml patch | diff1 | diff2 | blob | history
proto/bfd/bfd.c patch | diff1 | diff2 | blob | history

diff --cc doc/bird.sgml
Simple merge
diff --cc proto/bfd/bfd.c
Simple merge
Mirror of https://gitlab.labs.nic.cz/labs/bird.git