diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-16 16:14:30 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-16 16:14:30 +0100 |
| commit | 18e60f46a1bbdbcb446369a0f03dbb04f29fb71e (patch) | |
| tree | ed65387ee8dde4afad5d1d10eae5c8d2de9ccd23 /runtime/srutils.c | |
| parent | 095021e866188d2db9eb267304a6bb73c19545e0 (diff) | |
| parent | bd22bf8cb414f12c7b307bef463fbda5d51bee22 (diff) | |
| download | rsyslog-18e60f46a1bbdbcb446369a0f03dbb04f29fb71e.tar.gz rsyslog-18e60f46a1bbdbcb446369a0f03dbb04f29fb71e.tar.bz2 rsyslog-18e60f46a1bbdbcb446369a0f03dbb04f29fb71e.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
runtime/debug.h
runtime/obj.c
runtime/parser.h
runtime/wti.h
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}, |