diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-16 17:04:10 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-16 17:04:10 +0100 |
commit | abb381b8a5861be1d065afea85f355f478d87e5d (patch) | |
tree | e6a68876e67f9c3a3ec0f87194a9bafccf08210b /runtime/sysvar.h | |
parent | d5a18a93ae585c25d67ec200b308f08c6bd6d5b2 (diff) | |
parent | de52870bb16c9ad6acba92c40af86f2c70069c97 (diff) | |
download | rsyslog-abb381b8a5861be1d065afea85f355f478d87e5d.tar.gz rsyslog-abb381b8a5861be1d065afea85f355f478d87e5d.tar.bz2 rsyslog-abb381b8a5861be1d065afea85f355f478d87e5d.zip |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
plugins/imtcp/imtcp.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. * |