diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-20 14:17:39 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-20 14:17:39 +0100 |
commit | c0e58be06bf7c354c72f54c08be469d180ec6d99 (patch) | |
tree | 86576e2fc91072206b76b69c2fbfdbe65ada56b3 /plugins/omstdout/omstdout.c | |
parent | 0049a3b51bf8beb1b40e7ee6f95f4de4f040dfd8 (diff) | |
parent | 2c3bce4e31608572b8d469237c086da6656afa8a (diff) | |
download | rsyslog-c0e58be06bf7c354c72f54c08be469d180ec6d99.tar.gz rsyslog-c0e58be06bf7c354c72f54c08be469d180ec6d99.tar.bz2 rsyslog-c0e58be06bf7c354c72f54c08be469d180ec6d99.zip |
Merge branch 'v7-devel'
Conflicts:
tests/Makefile.am
Diffstat (limited to 'plugins/omstdout/omstdout.c')
0 files changed, 0 insertions, 0 deletions