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/srutils.c | |
| 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/srutils.c')
| -rw-r--r-- | runtime/srutils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/srutils.c b/runtime/srutils.c index d357cd77..a473c83e 100644 --- a/runtime/srutils.c +++ b/runtime/srutils.c @@ -54,6 +54,8 @@ * to do it, but over here is also not ideal... -- rgerhards, 2008-02-14 * rgerhards, 2008-04-16: note in LGPL move: the code tables below exist in * the same way in BSD, so it is not a problem to move them from GPLv3 to LGPL. + * And nobody modified them since it was under LGPL, so we can also move it + * to ASL 2.0. */ syslogName_t syslogPriNames[] = { {"alert", LOG_ALERT}, |