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: 6a996cb 538fec7)

author	Ondrej Zajicek <santiago@crfreenet.org>
	Fri, 2 May 2014 16:27:40 +0000 (18:27 +0200)
committer	Ondrej Zajicek <santiago@crfreenet.org>
	Fri, 2 May 2014 16:27:40 +0000 (18:27 +0200)
commit	3f6bfbbf1c0dbc645a34ea79a132a64e7d35934f
tree	9d6d023a27b4b6011a67f3ecec2bb40959de5070	tree
parent	6a996cb921a2ee68b5c9f05d247a1f97a9a17a8c	commit \| diff
parent	538fec7b1b7dd729eadf1c933e27f59080cd3576	commit \| diff

Merge commit '538fec7b1b7dd729eadf1c933e27f59080cd3576' into integrated

conf/cf-lex.l	diff1 \|	diff2 \|	blob \| history
conf/conf.c	diff1 \|	diff2 \|	blob \| history
nest/config.Y	diff1 \|	diff2 \|	blob \| history
proto/bgp/packets.c	diff1 \|	diff2 \|	blob \| history
proto/ospf/config.Y	diff1 \|	diff2 \|	blob \| history
proto/rip/config.Y	diff1 \|	diff2 \|	blob \| history
sysdep/config.h	diff1 \|	diff2 \|	blob \| history
sysdep/linux/sysio.h	diff1 \|	diff2 \|	blob \| history

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