diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-16 16:25:45 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-16 16:25:45 +0100 |
| commit | 29807bb3c918603f41eeaa2d15e89852a2657f9c (patch) | |
| tree | 343c0856e562fac140eae3fabbb137ff39534fec /runtime/module-template.h | |
| parent | 17ee19bb5c15c666422358a215c118791b2cce7a (diff) | |
| parent | 18e60f46a1bbdbcb446369a0f03dbb04f29fb71e (diff) | |
| download | rsyslog-29807bb3c918603f41eeaa2d15e89852a2657f9c.tar.gz rsyslog-29807bb3c918603f41eeaa2d15e89852a2657f9c.tar.bz2 rsyslog-29807bb3c918603f41eeaa2d15e89852a2657f9c.zip | |
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts:
plugins/impstats/impstats.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 c2585e67..e21d6157 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 |