]> git.ipfire.org Git - thirdparty/bird.git/commit
Merge commit '0bb4e37db317a1290bad24fe430cac6569a9bd8c' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Tue, 29 Apr 2014 14:32:08 +0000 (16:32 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Tue, 29 Apr 2014 14:32:08 +0000 (16:32 +0200)
commit37c21534578da9375fe9c2a5e712ed1cf841800d
tree53ae3a4047608f90194dbe104d86ec2621ad8dab
parentb1c680a680e2b78b5e646aedae6c5229edf7c7ae
parent0bb4e37db317a1290bad24fe430cac6569a9bd8c
Merge commit '0bb4e37db317a1290bad24fe430cac6569a9bd8c' into integrated

Conflicts:

sysdep/linux/netlink.c
conf/conf.c
filter/filter.h
nest/proto.c
proto/ospf/iface.c
sysdep/bsd/krt-sock.c
sysdep/config.h
sysdep/unix/krt.c
sysdep/unix/krt.h