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/sysvar.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/sysvar.h')
-rw-r--r-- | runtime/sysvar.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/sysvar.h b/runtime/sysvar.h index 35051b64..3414ff34 100644 --- a/runtime/sysvar.h +++ b/runtime/sysvar.h @@ -1,7 +1,7 @@ /* The sysvar object. So far, no instance can be defined (makes logically no * sense). * - * Copyright 2008 Rainer Gerhards and Adiscon GmbH. + * Copyright 2008-2012 Adiscon GmbH. * * This file is part of the rsyslog runtime library. * |