]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
projects / thirdparty / bird.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d6620a 81a20ca)
Merge commit '81a20ca5' into mq-aggregator-for-v3
authorMaria Matejka <mq@ucw.cz>
Thu, 9 Nov 2023 14:50:39 +0000 (15:50 +0100)
committerMaria Matejka <mq@ucw.cz>
Thu, 9 Nov 2023 14:50:39 +0000 (15:50 +0100)
1  2 
nest/mpls.c patch | diff1 | diff2 | blob | history
proto/static/static.c patch | diff1 | diff2 | blob | history

diff --cc nest/mpls.c
Simple merge
diff --cc proto/static/static.c
Simple merge
Mirror of https://gitlab.labs.nic.cz/labs/bird.git