diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-02 12:40:48 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-02 12:40:48 +0200 |
| commit | bad4228f846d18bd721266931efbbf0b21375a92 (patch) | |
| tree | 8d1a94582c8a16463f63bcb1f7be0c8db6174d07 /runtime | |
| parent | 434e404a6c7181a2b7efa9840506e8963665bdd6 (diff) | |
| parent | 2493915cfedae899e66dbb3a2f139bf386fac5e1 (diff) | |
| download | rsyslog-bad4228f846d18bd721266931efbbf0b21375a92.tar.gz rsyslog-bad4228f846d18bd721266931efbbf0b21375a92.tar.xz rsyslog-bad4228f846d18bd721266931efbbf0b21375a92.zip | |
Merge branch 'beta'
Conflicts:
plugins/imklog/linux.c
runtime/cfsysline.c
runtime/ctok.c
runtime/linkedlist.c
runtime/sysvar.c
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/cfsysline.c | 4 | ||||
| -rw-r--r-- | runtime/ctok.c | 2 | ||||
| -rw-r--r-- | runtime/linkedlist.c | 2 | ||||
| -rw-r--r-- | runtime/sysvar.c | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c index 2124f11e..0043ce5c 100644 --- a/runtime/cfsysline.c +++ b/runtime/cfsysline.c @@ -3,7 +3,9 @@ * * File begun on 2007-07-30 by RGerhards * - * Copyright (C) 2007, 2008 by Rainer Gerhards and Adiscon GmbH + * Copyright (C) 2007, 2008 by Rainer Gerhards and Adiscon GmbH. + * + * This file is part of rsyslog. * * This file is part of the rsyslog runtime library. * diff --git a/runtime/ctok.c b/runtime/ctok.c index 2a92e285..de2bd8a8 100644 --- a/runtime/ctok.c +++ b/runtime/ctok.c @@ -8,7 +8,7 @@ * * Module begun 2008-02-19 by Rainer Gerhards * - * Copyright (C) 2008 by Rainer Gerhards and Adiscon GmbH + * Copyright (C) 2008 by Rainer Gerhards and Adiscon GmbH. * * This file is part of the rsyslog runtime library. * diff --git a/runtime/linkedlist.c b/runtime/linkedlist.c index ce20651e..8f842e43 100644 --- a/runtime/linkedlist.c +++ b/runtime/linkedlist.c @@ -11,7 +11,7 @@ * * File begun on 2007-07-31 by RGerhards * - * Copyright (C) 2007, 2008 by Rainer Gerhards and Adiscon GmbH + * Copyright (C) 2007, 2008 by Rainer Gerhards and Adiscon GmbH. * * This file is part of the rsyslog runtime library. * diff --git a/runtime/sysvar.c b/runtime/sysvar.c index d59f2623..5eec8f67 100644 --- a/runtime/sysvar.c +++ b/runtime/sysvar.c @@ -5,7 +5,7 @@ * * Module begun 2008-02-25 by Rainer Gerhards * - * Copyright (C) 2008 by Rainer Gerhards and Adiscon GmbH + * Copyright (C) 2008 by Rainer Gerhards and Adiscon GmbH. * * This file is part of the rsyslog runtime library. * |