diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 18:47:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 18:47:06 +0200 |
| commit | 527edddb4646c24fa9a587601cd90d7a57a1fcf0 (patch) | |
| tree | ff881cc053915d617f1ec6465b8d8c01897c6563 /contrib | |
| parent | d3eb89a5fe1dbcda028c0ab5e6753578716539d7 (diff) | |
| parent | 84084ea2a178f782184d75db10f252efdc62fb5f (diff) | |
| download | rsyslog-527edddb4646c24fa9a587601cd90d7a57a1fcf0.tar.gz rsyslog-527edddb4646c24fa9a587601cd90d7a57a1fcf0.tar.xz rsyslog-527edddb4646c24fa9a587601cd90d7a57a1fcf0.zip | |
Merge branch 'v4-devel'
Conflicts:
runtime/msg.h
runtime/rsyslog.h
runtime/stream.c
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions