diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-18 13:55:16 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-18 13:55:16 +0100 |
| commit | c9b70abf1a7a40b5afc80975d016980dd4e63e36 (patch) | |
| tree | 33171a0c1dae68dc1ab650e3ab24bd973584cf84 /runtime/srutils.c | |
| parent | fe4cfa6d1f37aaac61a7cbab03df30ac1909f5cf (diff) | |
| parent | 92f7e549df5a1333f037cf3b290e3087fd9ad5da (diff) | |
| download | rsyslog-c9b70abf1a7a40b5afc80975d016980dd4e63e36.tar.gz rsyslog-c9b70abf1a7a40b5afc80975d016980dd4e63e36.tar.bz2 rsyslog-c9b70abf1a7a40b5afc80975d016980dd4e63e36.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imptcp/imptcp.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}, |