diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-20 09:06:03 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-20 09:06:03 +0200 |
commit | d5dad734ab47a6fc0bc3c4bd9a24e6671607bdab (patch) | |
tree | 723fbe5b6a11e801e25ab64e44feb38b4c63fb96 /plugins/omprog/omprog.c | |
parent | a0c34c0a49b142c71450249ba0f5ef6bf4465b90 (diff) | |
parent | b1e2559b17ea2992b5c288d311efc84ad82ac129 (diff) | |
download | rsyslog-d5dad734ab47a6fc0bc3c4bd9a24e6671607bdab.tar.gz rsyslog-d5dad734ab47a6fc0bc3c4bd9a24e6671607bdab.tar.bz2 rsyslog-d5dad734ab47a6fc0bc3c4bd9a24e6671607bdab.zip |
Merge branch 'v7-stable-mmrfc5424addhmac'
Conflicts:
Makefile.am
configure.ac
Diffstat (limited to 'plugins/omprog/omprog.c')
0 files changed, 0 insertions, 0 deletions