]> git.ipfire.org Git - thirdparty/bird.git/commit
Merge commit 'f48fa14214301382b2e6b134788a7506b61b664f' into integrated
authorOndrej Zajicek <santiago@crfreenet.org>
Tue, 29 Apr 2014 15:23:38 +0000 (17:23 +0200)
committerOndrej Zajicek <santiago@crfreenet.org>
Tue, 29 Apr 2014 15:23:38 +0000 (17:23 +0200)
commita485fd2909b947ee45810c71d8d7a6543f7e40e5
tree0311db22098465c31ecc2a1694aa8b0a95b2ded8
parent91ea1b134be8fa7c8e60296301758ff1a36981c7
parentf48fa14214301382b2e6b134788a7506b61b664f
Merge commit 'f48fa14214301382b2e6b134788a7506b61b664f' into integrated

Conflicts:

nest/rt-table.c
proto/bgp/attrs.c
proto/bgp/packets.c
proto/ospf/ospf.c
proto/rip/rip.c
proto/static/static.c
sysdep/unix/krt.c
15 files changed:
nest/proto.c
nest/protocol.h
nest/route.h
nest/rt-dev.c
nest/rt-table.c
proto/bgp/attrs.c
proto/bgp/packets.c
proto/ospf/ospf.c
proto/ospf/rt.c
proto/rip/rip.c
proto/rip/rip.h
proto/static/static.c
sysdep/bsd/krt-sock.c
sysdep/linux/netlink.c
sysdep/unix/krt.c