diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-08 18:06:57 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-08 18:06:57 +0200 |
| commit | 060ea06c41012a00db17cfbd2cff5b2eade3eb51 (patch) | |
| tree | d7759af829587dbd1a4b1de9745c5b3db0053bd7 /plugins/imklog/ksyms.h | |
| parent | 285444aa313454b09ad0cac1e29f326cd4373096 (diff) | |
| parent | c574f90c450ece3e336612e232e464b7c8d08ab1 (diff) | |
| download | rsyslog-060ea06c41012a00db17cfbd2cff5b2eade3eb51.tar.gz rsyslog-060ea06c41012a00db17cfbd2cff5b2eade3eb51.tar.xz rsyslog-060ea06c41012a00db17cfbd2cff5b2eade3eb51.zip | |
Merge branch 'beta'
Conflicts:
syslogd.c
Diffstat (limited to 'plugins/imklog/ksyms.h')
| -rw-r--r-- | plugins/imklog/ksyms.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/plugins/imklog/ksyms.h b/plugins/imklog/ksyms.h index 316950a0..b5362ff3 100644 --- a/plugins/imklog/ksyms.h +++ b/plugins/imklog/ksyms.h @@ -1,10 +1,9 @@ -/* - ksym.h - Definitions for symbol table utilities. - Copyright (c) 1995, 1996 Dr. G.W. Wettstein <greg@wind.rmcc.com> - Copyright (c) 1996 Enjellic Systems Development - - This file is part of the sysklogd package, a kernel and system log daemon. - +/* ksym.h - Definitions for symbol table utilities. + * Copyright (c) 1995, 1996 Dr. G.W. Wettstein <greg@wind.rmcc.com> + * Copyright (c) 1996 Enjellic Systems Development + * Copyright (c) 2004-7 Martin Schulze <joey@infodrom.org> + * Copyright (c) 2007-2008 Rainer Gerhards <rgerhards@adiscon.com> + * * This file is part of rsyslog. * * Rsyslog is free software: you can redistribute it and/or modify @@ -21,7 +20,7 @@ * along with Rsyslog. If not, see <http://www.gnu.org/licenses/>. * * A copy of the GPL can be found in the file "COPYING" in this distribution. -*/ + */ /* Variables, structures and type definitions static to this module. */ |