diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-01 12:25:39 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-01 12:25:39 +0100 |
| commit | 115718de967f673fc89ce8b8be1b16081ca4dde1 (patch) | |
| tree | 31c8ba575f8db55ea7f769d9b1907c65bcc6aa12 /runtime/queue.c | |
| parent | aafa9b41a5f06b88f11df5c837427e171e1048d7 (diff) | |
| parent | c2970de8b0dd07c52f3a107e5ec3de55010c9999 (diff) | |
| download | rsyslog-115718de967f673fc89ce8b8be1b16081ca4dde1.tar.gz rsyslog-115718de967f673fc89ce8b8be1b16081ca4dde1.tar.bz2 rsyslog-115718de967f673fc89ce8b8be1b16081ca4dde1.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
plugins/imklog/imklog.c
plugins/imklog/imklog.h
Diffstat (limited to 'runtime/queue.c')
0 files changed, 0 insertions, 0 deletions