]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
projects / thirdparty / bird.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: efd7c87 1aec711)
Merge remote-tracking branch 'origin/master' into mq-filter-stack
authorMaria Matejka <mq@ucw.cz>
Mon, 15 Jul 2019 14:07:16 +0000 (16:07 +0200)
committerMaria Matejka <mq@ucw.cz>
Mon, 15 Jul 2019 14:07:16 +0000 (16:07 +0200)
1  2 
proto/ospf/ospf.c patch | diff1 | diff2 | blob | history
proto/ospf/ospf.h patch | diff1 | diff2 | blob | history

diff --cc proto/ospf/ospf.c
Simple merge
diff --cc proto/ospf/ospf.h
Simple merge
Mirror of https://gitlab.labs.nic.cz/labs/bird.git