summaryrefslogtreecommitdiffstats
path: root/plugins/omprog/omprog.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2013-06-17 14:58:52 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-06-17 14:58:52 +0200
commitd7e72ffd7e06df4974544d159f6c2363964ce8ec (patch)
treebeb4463a16d8c631cb0b6872ce0926bb730769f3 /plugins/omprog/omprog.c
parentfa523900ba66cda045d16476d64fd89d8d6f0bdc (diff)
parent2704b0ca2292929e66c951d94bc18a316ee77541 (diff)
downloadrsyslog-d7e72ffd7e06df4974544d159f6c2363964ce8ec.tar.gz
rsyslog-d7e72ffd7e06df4974544d159f6c2363964ce8ec.tar.bz2
rsyslog-d7e72ffd7e06df4974544d159f6c2363964ce8ec.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