]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit '9ffea830' into thread-next
authorMaria Matejka <mq@ucw.cz>
Sat, 28 Oct 2023 22:51:34 +0000 (00:51 +0200)
committerMaria Matejka <mq@ucw.cz>
Sat, 28 Oct 2023 22:51:34 +0000 (00:51 +0200)
1  2 
conf/cf-lex.l
conf/conf.h

diff --cc conf/cf-lex.l
Simple merge
diff --cc conf/conf.h
Simple merge