]> git.ipfire.org Git - thirdparty/bird.git/commit
Merge commit '0aeac9cb7f9887374ce0258c8653f9518529bf08' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Tue, 29 Apr 2014 14:17:09 +0000 (16:17 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Tue, 29 Apr 2014 14:17:09 +0000 (16:17 +0200)
commitf47914c8a893b066477f50030d9e078d023395b5
treee310f3e6d21bb9c9e12141dc2784965bdcc62377
parent51e37fbb403a74787ff353cc54f223021763e76d
parent0aeac9cb7f9887374ce0258c8653f9518529bf08
Merge commit '0aeac9cb7f9887374ce0258c8653f9518529bf08' into integrated

Conflicts:

configure.in
lib/printf.c
proto/ospf/config.Y
proto/ospf/hello.c
proto/ospf/iface.c
proto/ospf/ospf.h
conf/confbase.Y
configure.in
filter/filter.h
lib/printf.c
nest/proto.c
proto/ospf/config.Y
proto/ospf/iface.c
proto/ospf/neighbor.c
sysdep/unix/io.c