]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit '1b064355f752b9bfe4644f775697bbd9b711f762' into thread-next
authorOndrej Zajicek <santiago@crfreenet.org>
Mon, 1 Apr 2024 16:20:18 +0000 (18:20 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Mon, 1 Apr 2024 16:20:18 +0000 (18:20 +0200)
1  2 
conf/gen_parser.m4
nest/config.Y
proto/bfd/config.Y
proto/ospf/config.Y

Simple merge
diff --cc nest/config.Y
Simple merge
Simple merge
Simple merge