]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge remote-tracking branch 'origin/master' into soft-int
authorOndrej Zajicek <santiago@crfreenet.org>
Tue, 14 Oct 2014 15:23:34 +0000 (17:23 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Tue, 14 Oct 2014 15:23:34 +0000 (17:23 +0200)
1  2 
doc/bird.sgml
lib/birdlib.h

diff --cc doc/bird.sgml
Simple merge
diff --cc lib/birdlib.h
Simple merge