diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-12 14:53:17 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-12 14:53:17 +0200 |
| commit | c04f196e25d63a7f45bf2ad79b48019fed98e5c9 (patch) | |
| tree | a464307792f489bc9902ed5bfc6991ca082a25f4 /runtime | |
| parent | 920cc1e1640a7a01145111530106cf96a60b6086 (diff) | |
| parent | 4bc99a5ead6892393033d22d6ce46052aca36155 (diff) | |
| download | rsyslog-c04f196e25d63a7f45bf2ad79b48019fed98e5c9.tar.gz rsyslog-c04f196e25d63a7f45bf2ad79b48019fed98e5c9.tar.xz rsyslog-c04f196e25d63a7f45bf2ad79b48019fed98e5c9.zip | |
Merge branch 'v2-stable' into v3-stable
Conflicts:
ChangeLog
syslogd.c
Diffstat (limited to 'runtime')
0 files changed, 0 insertions, 0 deletions