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: c570200 13d4dd1)

author	Ondrej Zajicek <santiago@crfreenet.org>
	Sat, 12 Jan 2013 23:44:39 +0000 (00:44 +0100)
committer	Ondrej Zajicek <santiago@crfreenet.org>
	Sat, 12 Jan 2013 23:44:39 +0000 (00:44 +0100)
commit	0596b3dbf932cedf89df3277683e36d7dd2fc66c
tree	fc3a0f01d7033b8601f126b3fbfc94d320db61fb	tree
parent	c570200d398aff8c5161437446eca5ee15c3856f	commit \| diff
parent	13d4dd138d5dc6c884ded280f9244fac707c4f32	commit \| diff

Merge commit '13d4dd138d5dc6c884ded280f9244fac707c4f32' into integrated

conf/conf.c	diff1 \|	diff2 \|	blob \| history
filter/filter.c	diff1 \|	diff2 \|	blob \| history
nest/config.Y	diff1 \|	diff2 \|	blob \| history
nest/iface.c	diff1 \|	diff2 \|	blob \| history
nest/proto.c	diff1 \|	diff2 \|	blob \| history
nest/protocol.h	diff1 \|	diff2 \|	blob \| history
nest/rt-table.c	diff1 \|	diff2 \|	blob \| history
proto/ospf/ospf.c	diff1 \|	diff2 \|	blob \| history
sysdep/unix/io.c	diff1 \|	diff2 \|	blob \| history
sysdep/unix/krt.c	diff1 \|	diff2 \|	blob \| history
sysdep/unix/unix.h	diff1 \|	diff2 \|	blob \| history

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