Maria Matejka 0ba22509a8 Merge commit '51f2e7af' into thread-next ... Conflicts: conf/cf-lex.l conf/conf.h conf/confbase.Y filter/config.Y nest/config.Y nest/proto.c nest/rt-table.c proto/bgp/bgp.c sysdep/unix/main.c		2023-10-27 18:29:31 +02:00
..
bsd	Merge commit 'd61505b039bf0aa6697e28b2a4e07907c89ba1fb' into thread-next	2023-04-24 10:40:53 +02:00
bsd-netlink	Netlink: move OS-specific headers and defines to sysdep	2022-12-16 19:21:51 +01:00
cf	Alloc: Disable transparent huge pages	2023-01-17 17:13:50 +01:00
linux	Merge commit '5951dfbd' into thread-next	2023-10-27 18:06:34 +02:00
unix	Merge commit '51f2e7af' into thread-next	2023-10-27 18:29:31 +02:00
config.h	NEWS and version update	2023-06-22 16:14:12 +02:00
Doc	Doc: Rename code documentation files back to Doc	2018-12-14 02:03:42 +01:00
sysdep.sgml	Spelling fixes to progdoc.	2000-06-07 12:29:08 +00:00