diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-16 16:14:30 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-16 16:14:30 +0100 |
| commit | 18e60f46a1bbdbcb446369a0f03dbb04f29fb71e (patch) | |
| tree | ed65387ee8dde4afad5d1d10eae5c8d2de9ccd23 /runtime/module-template.h | |
| parent | 095021e866188d2db9eb267304a6bb73c19545e0 (diff) | |
| parent | bd22bf8cb414f12c7b307bef463fbda5d51bee22 (diff) | |
| download | rsyslog-18e60f46a1bbdbcb446369a0f03dbb04f29fb71e.tar.gz rsyslog-18e60f46a1bbdbcb446369a0f03dbb04f29fb71e.tar.xz rsyslog-18e60f46a1bbdbcb446369a0f03dbb04f29fb71e.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
runtime/debug.h
runtime/obj.c
runtime/parser.h
runtime/wti.h
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 |