]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
projects / thirdparty / bird.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 980ef11 54ddf90)
Merge commit '54ddf90f6370f06efc71c3ffd6e02d031a86866f' into mq-aggregator-for-v3
authorMaria Matejka <mq@ucw.cz>
Fri, 8 Dec 2023 08:08:38 +0000 (09:08 +0100)
committerMaria Matejka <mq@ucw.cz>
Fri, 8 Dec 2023 08:08:38 +0000 (09:08 +0100)
1  2 
conf/conf.h patch | diff1 | diff2 | blob | history
nest/route.h patch | diff1 | diff2 | blob | history
nest/rt-table.c patch | diff1 | diff2 | blob | history

diff --cc conf/conf.h
Simple merge
diff --cc nest/route.h
Simple merge
diff --cc nest/rt-table.c
Simple merge
Mirror of https://gitlab.labs.nic.cz/labs/bird.git