]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
projects / thirdparty / bird.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eae4177 8e9e013)
Merge commit '8e9e013b' into mq-aggregator-for-v3
authorMaria Matejka <mq@ucw.cz>
Thu, 9 Nov 2023 14:35:18 +0000 (15:35 +0100)
committerMaria Matejka <mq@ucw.cz>
Thu, 9 Nov 2023 14:35:18 +0000 (15:35 +0100)
1  2 
conf/confbase.Y patch | diff1 | diff2 | blob | history
nest/mpls.c patch | diff1 | diff2 | blob | history

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