]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
Merge commit 'd776540811cdf672dc113f29feef2415465589c6' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Fri, 2 May 2014 15:42:20 +0000 (17:42 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Fri, 2 May 2014 15:42:20 +0000 (17:42 +0200)
1  2 
configure.in
sysdep/unix/unix.h

diff --cc configure.in
Simple merge
Simple merge