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/srutils.c | |
| 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/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}, |