]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
projects / thirdparty / bird.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13c0be1 caa9d03)
Merge branch 'int-new' into HEAD
authorJan Maria Matejka <mq@ucw.cz>
Tue, 19 Jun 2018 12:32:16 +0000 (14:32 +0200)
committerJan Maria Matejka <mq@ucw.cz>
Tue, 19 Jun 2018 12:32:16 +0000 (14:32 +0200)
1  2 
proto/babel/babel.c patch | diff1 | diff2 | blob | history
proto/bgp/attrs.c patch | diff1 | diff2 | blob | history

diff --cc proto/babel/babel.c
Simple merge
diff --cc proto/bgp/attrs.c
Simple merge
Mirror of https://gitlab.labs.nic.cz/labs/bird.git