]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
projects / thirdparty / bird.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c58962 2e84b4e)
Merge commit '2e84b4e82dbf8fce0fd12fb0c25d925ffd287970' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Fri, 2 May 2014 16:14:15 +0000 (18:14 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Fri, 2 May 2014 16:14:15 +0000 (18:14 +0200)
1  2 
nest/proto.c patch | diff1 | diff2 | blob | history

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