diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-26 12:41:50 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-26 12:41:50 +0200 |
| commit | a8b1e96d7bf91d97646789c1805587ca1ebba3e9 (patch) | |
| tree | fea136da0c5c290c953d8b80a4b233a96de5d247 /plugins/omprog/omprog.c | |
| parent | 039e23df84ed435ebd674ff5bcad6098b5038664 (diff) | |
| parent | b810f0dd3ade85efeb7dc9b99fade798764d0ac2 (diff) | |
| download | rsyslog-a8b1e96d7bf91d97646789c1805587ca1ebba3e9.tar.gz rsyslog-a8b1e96d7bf91d97646789c1805587ca1ebba3e9.tar.bz2 rsyslog-a8b1e96d7bf91d97646789c1805587ca1ebba3e9.zip | |
Merge branch 'v7-stable-mmrfc5424addhmac'
Conflicts:
Makefile.am
configure.ac
runtime/msg.c
runtime/rsyslog.h
Diffstat (limited to 'plugins/omprog/omprog.c')
0 files changed, 0 insertions, 0 deletions