diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-18 11:14:14 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-18 11:14:14 +0200 |
commit | f529e8b2c3bb2c087bfba3fc5610a66fdbe1a8ae (patch) | |
tree | 01d936d7497a0c8ab4ba8e73b521042e2bee510f /runtime/strmsrv.h | |
parent | d2d54013aebb756169182ed8716b142d27134a70 (diff) | |
parent | a6ed4b59cc39fe802d06f113f238f1ffe90b7cf6 (diff) | |
download | rsyslog-f529e8b2c3bb2c087bfba3fc5610a66fdbe1a8ae.tar.gz rsyslog-f529e8b2c3bb2c087bfba3fc5610a66fdbe1a8ae.tar.xz rsyslog-f529e8b2c3bb2c087bfba3fc5610a66fdbe1a8ae.zip |
Merge branch 'master' into newmsg
Conflicts:
tools/omfile.c
Diffstat (limited to 'runtime/strmsrv.h')
0 files changed, 0 insertions, 0 deletions