diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-25 15:59:46 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-08-25 15:59:46 +0200 |
commit | b3e16a9f531dff0d973be3917eca114ab6ab7c45 (patch) | |
tree | 498598eda1810eaa6b892a3c36e153f9bdabf282 /shave.in | |
parent | d8ab04b533a6d2fc224e1931463b91508cc6d701 (diff) | |
parent | 1164429974dcd71ef59dededd3fec54162d919dd (diff) | |
download | rsyslog-b3e16a9f531dff0d973be3917eca114ab6ab7c45.tar.gz rsyslog-b3e16a9f531dff0d973be3917eca114ab6ab7c45.tar.xz rsyslog-b3e16a9f531dff0d973be3917eca114ab6ab7c45.zip |
Merge branch 'v4-stable' into v4-devel
Conflicts:
ChangeLog
runtime/msg.c
Diffstat (limited to 'shave.in')
0 files changed, 0 insertions, 0 deletions