]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
projects / thirdparty / bird.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b4b7c6 165156b)
Merge commit '165156beeb2926472bbceca3c103aacc3f81a8cc' into haugesund
authorMaria Matejka <mq@ucw.cz>
Mon, 30 May 2022 14:53:18 +0000 (16:53 +0200)
committerMaria Matejka <mq@ucw.cz>
Mon, 30 May 2022 14:53:18 +0000 (16:53 +0200)
1  2 
conf/conf.h patch | diff1 | diff2 | blob | history
nest/config.Y patch | diff1 | diff2 | blob | history

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