]> git.ipfire.org Git - thirdparty/bird.git/commit
Merge branch 'master' into int-new
authorOndrej Zajicek (work) <santiago@crfreenet.org>
Wed, 25 Nov 2015 13:24:35 +0000 (14:24 +0100)
committerOndrej Zajicek (work) <santiago@crfreenet.org>
Wed, 25 Nov 2015 13:24:35 +0000 (14:24 +0100)
commit04ae8ddaa15b72c265dc7cf038b733d235198754
treeeadc4dfee9a0f0eba3446538129608dffbde4625
parentd44e686e9bcae5850115c0e1adfe24523dce61ee
parent33b4f40acce02c90b4b7766c5c94ebf2d22765c6
Merge branch 'master' into int-new
conf/cf-lex.l
conf/conf.c
lib/ip.c
lib/ip.h
nest/rt-table.c
proto/ospf/packet.c
proto/rip/packets.c
sysdep/linux/netlink.c
sysdep/unix/krt.c