diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 15:49:40 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 15:49:40 +0200 |
| commit | eefb295c90fb51c9f6f7c1a5bb95bba52d3a3557 (patch) | |
| tree | 1f309ab4f05918283aebcafb9ffac963d3a4ff39 /plugins/imuxsock/imuxsock.c | |
| parent | d6da57ae0370aeb705f63fd04e575b5ed4684618 (diff) | |
| parent | c64203c7f2c886712c33c21de7e0e53b7939a883 (diff) | |
| download | rsyslog-eefb295c90fb51c9f6f7c1a5bb95bba52d3a3557.tar.gz rsyslog-eefb295c90fb51c9f6f7c1a5bb95bba52d3a3557.tar.xz rsyslog-eefb295c90fb51c9f6f7c1a5bb95bba52d3a3557.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imptcp/imptcp.c
plugins/imtcp/imtcp.c
Diffstat (limited to 'plugins/imuxsock/imuxsock.c')
0 files changed, 0 insertions, 0 deletions