]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
projects / thirdparty / bird.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8465dcc acb04cf)
Merge branch 'master' into rip-new
authorOndrej Zajicek (work) <santiago@crfreenet.org>
Sat, 17 Oct 2015 12:44:34 +0000 (14:44 +0200)
committerOndrej Zajicek (work) <santiago@crfreenet.org>
Sat, 17 Oct 2015 12:44:34 +0000 (14:44 +0200)
1  2 
nest/route.h patch | diff1 | diff2 | blob | history
proto/ospf/packet.c patch | diff1 | diff2 | blob | history

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