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/nsd.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/nsd.h')
| -rw-r--r-- | runtime/nsd.h | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/runtime/nsd.h b/runtime/nsd.h index e5b9320b..d1f164ec 100644 --- a/runtime/nsd.h +++ b/runtime/nsd.h @@ -4,25 +4,23 @@ * implemented by concrete classes. As such, no nsd data type itself * is defined. * - * Copyright 2008 Rainer Gerhards and Adiscon GmbH. + * Copyright 2008-2012 Adiscon GmbH. * * 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 - * 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, - * 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. - * - * 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/>. - * - * 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. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * -or- + * see COPYING.ASL20 in the source distribution + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #ifndef INCLUDED_NSD_H #define INCLUDED_NSD_H |