]> git.ipfire.org Git - thirdparty/bird.git/commit
Merge branch 'master' into int-new-channels
authorJan Moskyto Matejka <mq@ucw.cz>
Fri, 8 Apr 2016 10:09:31 +0000 (12:09 +0200)
committerJan Moskyto Matejka <mq@ucw.cz>
Fri, 8 Apr 2016 10:28:33 +0000 (12:28 +0200)
commit7a7ac656829223713f9e6bcef63d2b5a5efce7d2
tree153afd214a815124b37fcd88c66134d716a390cf
parent4bdf1881dc6230b742d7efcaad8eeac4ed25f445
parent06edbb67ed807811654e7fd8f0f9b83766430216
Merge branch 'master' into int-new-channels
18 files changed:
filter/config.Y
filter/filter.c
lib/lists.h
lib/socket.h
nest/config.Y
nest/proto.c
nest/route.h
proto/bfd/bfd.c
proto/bgp/bgp.c
proto/ospf/iface.c
proto/ospf/neighbor.c
proto/ospf/topology.c
proto/rip/config.Y
sysdep/bsd/krt-sock.c
sysdep/linux/netlink.c
sysdep/unix/io.c
sysdep/unix/krt.c
sysdep/unix/main.c