]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
projects / thirdparty / bird.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50d5385 b0a8c7f)
Merge commit 'b0a8c7fc8547eef21ede33887580b5e867ee742c' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Tue, 29 Apr 2014 10:44:08 +0000 (12:44 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Tue, 29 Apr 2014 10:44:08 +0000 (12:44 +0200)
1  2 
doc/bird.sgml patch | diff1 | diff2 | blob | history

diff --cc doc/bird.sgml
Simple merge
Mirror of https://gitlab.labs.nic.cz/labs/bird.git