summaryrefslogtreecommitdiffstats
path: root/parse.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-01-14 18:32:40 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-01-14 18:32:40 +0100
commit0871d0a077c8adfdda8f055e021239dc4f354f7e (patch)
treeeb7d0a3ac4e5821b0ec8953717e49b838e062378 /parse.h
parenta357646ca124dbbf866606e8a48997154c40e205 (diff)
parente335a65788ccb9cd381dbd28982079a914f4ae4e (diff)
downloadrsyslog-0871d0a077c8adfdda8f055e021239dc4f354f7e.zip
rsyslog-0871d0a077c8adfdda8f055e021239dc4f354f7e.tar.gz
rsyslog-0871d0a077c8adfdda8f055e021239dc4f354f7e.tar.xz
Merge branch 'v4-stable' into v5-stable
Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c
Diffstat (limited to 'parse.h')
-rw-r--r--parse.h29
1 files changed, 14 insertions, 15 deletions
diff --git a/parse.h b/parse.h
index fb62d1e..69ae4b8 100644
--- a/parse.h
+++ b/parse.h
@@ -24,24 +24,23 @@
*
* begun 2005-09-09 rgerhards
*
- * Copyright (C) 2005 by Rainer Gerhards and Adiscon GmbH
+ * Copyright (C) 2005-2012 Adiscon GmbH
*
* This file is part of rsyslog.
*
- * 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.
- *
- * 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 General Public License for more details.
- *
- * 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.
+ * 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 _PARSE_H_INCLUDED__
#define _PARSE_H_INCLUDED__ 1