diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-26 18:45:12 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-26 18:45:12 +0200 |
| commit | df5c3b8cddc01d122df63e20e36272af67f2ac3c (patch) | |
| tree | 63a222ea5b75bae83c11b220db207d7603989023 /tools/syslogd.c | |
| parent | 19c8bed08dbeb9ce0313ec92d7de85c9c51c4f48 (diff) | |
| parent | 415b95cf453403f726f654cbc03ef3984446a870 (diff) | |
| download | rsyslog-df5c3b8cddc01d122df63e20e36272af67f2ac3c.tar.gz rsyslog-df5c3b8cddc01d122df63e20e36272af67f2ac3c.tar.xz rsyslog-df5c3b8cddc01d122df63e20e36272af67f2ac3c.zip | |
Merge branch 'v5-devel'
Conflicts:
tools/omfile.c
Diffstat (limited to 'tools/syslogd.c')
0 files changed, 0 insertions, 0 deletions