]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
projects / thirdparty / bird.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a32a4aa a9fc659)
Merge commit 'a9fc659b840e13323aa43e92eb8f39ceb19b5ed6' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Wed, 22 May 2013 13:56:00 +0000 (15:56 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Wed, 22 May 2013 13:56:00 +0000 (15:56 +0200)
Conflicts:

proto/rip/rip.c

1  2 
nest/config.Y patch | diff1 | diff2 | blob | history
nest/rt-table.c patch | diff1 | diff2 | blob | history
proto/rip/rip.c patch | diff1 | diff2 | blob | history

diff --cc nest/config.Y
Simple merge
diff --cc nest/rt-table.c
Simple merge
diff --cc proto/rip/rip.c
Simple merge
Mirror of https://gitlab.labs.nic.cz/labs/bird.git