diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-29 16:37:39 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-29 16:37:39 +0100 |
commit | 16f5c4b1c42c23e0b72e7913e6b05a28c3a30d8f (patch) | |
tree | 80d398b7fa0ddf2781b98c97a29db503862ee487 /plugins/omprog/omprog.c | |
parent | 2b3370b71bb909010fd55fd415c93944e2bb9546 (diff) | |
parent | 73e7088748e560cd0c6d1ed7264951d32f64d060 (diff) | |
download | rsyslog-16f5c4b1c42c23e0b72e7913e6b05a28c3a30d8f.tar.gz rsyslog-16f5c4b1c42c23e0b72e7913e6b05a28c3a30d8f.tar.bz2 rsyslog-16f5c4b1c42c23e0b72e7913e6b05a28c3a30d8f.zip |
Merge branch 'v7-stable'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'plugins/omprog/omprog.c')
0 files changed, 0 insertions, 0 deletions