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: 094d2bd 2b3d52a)

author	Ondrej Zajicek <santiago@crfreenet.org>
	Sat, 23 Nov 2013 10:50:34 +0000 (11:50 +0100)
committer	Ondrej Zajicek <santiago@crfreenet.org>
	Sat, 23 Nov 2013 10:50:34 +0000 (11:50 +0100)
commit	736e143fa50607fcd88132291e96089b899af979
tree	c0fcd5fb3174bae8a39b3a32dfe582b2ccb6df17	tree \| snapshot
parent	094d2bdb79e1ffa0a02761fd651aa0f0b6b0c585	commit \| diff
parent	2b3d52aa421ae1c31e30107beefd82fddbb42854	commit \| diff

Merge branch 'master' into add-path

Conflicts:

filter/filter.c
nest/proto.c
nest/rt-table.c
proto/bgp/bgp.h
proto/bgp/config.Y

22 files changed:

filter/filter.c	diff1 \|	diff2 \|	blob \| history
lib/string.h	diff1 \|	diff2 \|	blob \| history
nest/proto.c	diff1 \|	diff2 \|	blob \| history
nest/protocol.h	diff1 \|	diff2 \|	blob \| history
nest/route.h	diff1 \|	diff2 \|	blob \| history
nest/rt-attr.c	diff1 \|	diff2 \|	blob \| history
nest/rt-dev.c	diff1 \|	diff2 \|	blob \| history
nest/rt-table.c	diff1 \|	diff2 \|	blob \| history
proto/bgp/attrs.c	diff1 \|	diff2 \|	blob \| history
proto/bgp/bgp.c	diff1 \|	diff2 \|	blob \| history
proto/bgp/bgp.h	diff1 \|	diff2 \|	blob \| history
proto/bgp/config.Y	diff1 \|	diff2 \|	blob \| history
proto/bgp/packets.c	diff1 \|	diff2 \|	blob \| history
proto/ospf/ospf.c	diff1 \|	diff2 \|	blob \| history
proto/ospf/rt.c	diff1 \|	diff2 \|	blob \| history
proto/pipe/pipe.c	diff1 \|	diff2 \|	blob \| history
proto/rip/rip.c	diff1 \|	diff2 \|	blob \| history
proto/rip/rip.h	diff1 \|	diff2 \|	blob \| history
proto/static/static.c	diff1 \|	diff2 \|	blob \| history
sysdep/bsd/krt-sock.c	diff1 \|	diff2 \|	blob \| history
sysdep/linux/netlink.c	diff1 \|	diff2 \|	blob \| history
sysdep/unix/krt.c	diff1 \|	diff2 \|	blob \| history

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