]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge branch 'mq-aggregator-for-v3' into thread-next
authorMaria Matejka <mq@ucw.cz>
Thu, 9 Nov 2023 14:50:32 +0000 (15:50 +0100)
committerMaria Matejka <mq@ucw.cz>
Thu, 9 Nov 2023 14:50:32 +0000 (15:50 +0100)
1  2 
nest/mpls.c
nest/mpls.h

diff --cc nest/mpls.c
Simple merge
diff --cc nest/mpls.h
Simple merge