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

..

config.Y

Merge commit 'a5fc59587fe864e4fcfb44eb3be57231b4ca339b' into integrated

2014-04-29 15:15:35 +02:00

Doc

Reimplementation of prefix sets.

2009-03-31 12:55:57 +02:00

f-util.c

Implements wildcard matching in config file include.

2012-07-18 19:29:33 +02:00

filter.c

Merge commit '507e182a60c3704f8a28a0450f1affc2c7c1b66a' into integrated

2014-04-29 12:46:59 +02:00

filter.h

Merge commit '0bb4e37db317a1290bad24fe430cac6569a9bd8c' into integrated

2014-04-29 16:32:08 +02:00

Makefile

Reimplementation of prefix sets.

2009-03-31 12:55:57 +02:00

test6.conf

Reimplementation of prefix sets.

2009-03-31 12:55:57 +02:00

test.conf

Minor fix in log_commit() w.r.t. changes in BFD branch.

2013-11-22 21:58:43 +01:00

test.conf2

Allow matching on enums:

2000-06-01 08:32:49 +00:00

test.conf.inc

Implements wildcard matching in config file include.

2012-07-18 19:29:33 +02:00

tree.c

Merge commit 'origin/bfd'

2013-11-22 02:48:44 +01:00

trie.c

Merge commit 'origin/bfd'

2013-11-22 02:48:44 +01:00