0
0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2025-02-03 06:40:02 +00:00
Ondrej Zajicek a485fd2909 Merge commit 'f48fa14214301382b2e6b134788a7506b61b664f' into integrated
Conflicts:

	nest/rt-table.c
	proto/bgp/attrs.c
	proto/bgp/packets.c
	proto/ospf/ospf.c
	proto/rip/rip.c
	proto/static/static.c
	sysdep/unix/krt.c
2014-04-29 17:23:38 +02:00
..
2013-10-21 14:59:35 +02:00
2012-03-15 21:07:58 +01:00
2013-10-21 14:59:35 +02:00
2013-11-21 11:36:49 +01:00
Doc
2000-06-05 12:19:12 +00:00
2000-06-06 11:50:48 +00:00
2012-03-18 17:32:30 +01:00
2000-06-08 12:37:21 +00:00
2013-11-23 11:50:34 +01:00
2011-11-07 00:31:23 +01:00
2012-06-23 10:13:32 +02:00
2012-03-22 12:13:26 +01:00