diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-18 14:08:24 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-18 14:08:24 +0100 |
| commit | ac9afc4149db314d9c480232d70216960342e3e4 (patch) | |
| tree | a35a772b89985b2e73b76ddedc28dd5e0b507bf6 /runtime/module-template.h | |
| parent | e1e6ef71f4572de404d63a53f43c53c1b2b56803 (diff) | |
| parent | 92f7e549df5a1333f037cf3b290e3087fd9ad5da (diff) | |
| download | rsyslog-ac9afc4149db314d9c480232d70216960342e3e4.tar.gz rsyslog-ac9afc4149db314d9c480232d70216960342e3e4.tar.xz rsyslog-ac9afc4149db314d9c480232d70216960342e3e4.zip | |
Merge branch 'v5-stable' into master
Conflicts:
ChangeLog
action.h
configure.ac
doc/manual.html
plugins/immark/immark.c
plugins/impstats/impstats.c
plugins/imptcp/imptcp.c
plugins/imtcp/imtcp.c
runtime/cfsysline.c
runtime/cfsysline.h
runtime/conf.c
runtime/ctok.c
runtime/ctok.h
runtime/ctok_token.c
runtime/ctok_token.h
runtime/dnscache.h
runtime/expr.c
runtime/expr.h
runtime/rule.c
runtime/rule.h
runtime/ruleset.h
runtime/sysvar.c
runtime/vm.h
runtime/vmop.c
runtime/vmop.h
runtime/vmprg.c
runtime/vmprg.h
runtime/vmstk.c
runtime/vmstk.h
tools/omusrmsg.c
Diffstat (limited to 'runtime/module-template.h')
| -rw-r--r-- | runtime/module-template.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/runtime/module-template.h b/runtime/module-template.h index 95107cb6..8d8dc78c 100644 --- a/runtime/module-template.h +++ b/runtime/module-template.h @@ -4,25 +4,25 @@ * * File begun on 2007-07-25 by RGerhards * - * Copyright 2007 Rainer Gerhards and Adiscon GmbH. + * Copyright 2007 Adiscon GmbH. This is Adiscon-exclusive code without any other + * contributions. *** GPLv3 *** * * This file is part of the rsyslog runtime library. * - * The rsyslog runtime library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by + * Rsyslog is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * The rsyslog runtime library is distributed in the hope that it will be useful, + * Rsyslog is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public License - * along with the rsyslog runtime library. If not, see <http://www.gnu.org/licenses/>. + * You should have received a copy of the GNU General Public License + * 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. - * A copy of the LGPL can be found in the file "COPYING.LESSER" in this distribution. */ #ifndef MODULE_TEMPLATE_H_INCLUDED #define MODULE_TEMPLATE_H_INCLUDED 1 |