git.ipfire.org Git - thirdparty/bird.git/commit

]> git.ipfire.org Git - thirdparty/bird.git/commit

projects / thirdparty / bird.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 62e6490 2be9218)

author	Jan Moskyto Matejka <mq@ucw.cz>
	Wed, 22 Feb 2017 10:58:04 +0000 (11:58 +0100)
committer	Jan Moskyto Matejka <mq@ucw.cz>
	Wed, 22 Feb 2017 10:58:04 +0000 (11:58 +0100)
commit	c609d039860f97f400d2cf0e9ca2b4e87b3fd1cc
tree	6141291f6d6fbc0a90320f39c01bde49a119eadf	tree
parent	62e64905b76b88da72c522eac9276a74f60c9592	commit \| diff
parent	2be9218a3b1dfcc8e42c8d118e95f2074d9f7a7c	commit \| diff

Merge branch 'int-new' into nexthop-merged

configure.in	diff1 \|	diff2 \|	blob \| history
doc/bird.sgml	diff1 \|	diff2 \|	blob \| history
filter/filter.c	diff1 \|	diff2 \|	blob \| history
nest/route.h	diff1 \|	diff2 \|	blob \| history
proto/bgp/attrs.c	diff1 \|	diff2 \|	blob \| history
proto/bgp/packets.c	diff1 \|	diff2 \|	blob \| history
proto/ospf/rt.c	diff1 \|	diff2 \|	blob \| history
proto/ospf/rt.h	diff1 \|	diff2 \|	blob \| history
proto/rpki/rpki.c	diff1 \|	diff2 \|	blob \| history
sysdep/linux/netlink.c	diff1 \|	diff2 \|	blob \| history

Mirror of https://gitlab.labs.nic.cz/labs/bird.git