summaryrefslogtreecommitdiffstats
path: root/plugins/omprog/omprog.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-09-20 09:06:03 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-09-20 09:06:03 +0200
commitd5dad734ab47a6fc0bc3c4bd9a24e6671607bdab (patch)
tree723fbe5b6a11e801e25ab64e44feb38b4c63fb96 /plugins/omprog/omprog.c
parenta0c34c0a49b142c71450249ba0f5ef6bf4465b90 (diff)
parentb1e2559b17ea2992b5c288d311efc84ad82ac129 (diff)
downloadrsyslog-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