Maria Matejka da52d66177 Merge commit '58efa944' into thread-next ... Conflicts: conf/cf-lex.l conf/conf.h conf/confbase.Y conf/gen_keywords.m4 conf/gen_parser.m4 filter/config.Y nest/config.Y proto/bgp/config.Y proto/static/config.Y Keywords and attributes are split to separate namespaces, to avoid collisions between regular keyword use and attribute overlay.		2023-10-25 14:41:11 +02:00
..
attrs.c	Merge commit '4972590e' into thread-next	2023-10-12 11:05:28 +02:00
bgp.c	Protocol: better granularity of pool management	2023-10-13 10:22:09 +02:00
bgp.h	Merge commit '5121101136cb80151a9361c63dc4822afeb44eef' into thread-next	2023-10-12 14:12:33 +02:00
config.Y	Merge commit '58efa944' into thread-next	2023-10-25 14:41:11 +02:00
Doc	Doc: Rename code documentation files back to Doc	2018-12-14 02:03:42 +01:00
Makefile	Simplified the protocol hookup code in Makefiles	2022-08-18 22:07:30 +02:00
packets.c	Merge commit 'e3c0eca9' into thread-next	2023-10-13 11:04:39 +02:00