diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-06 17:03:51 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-12-06 17:03:51 +0100 |
| commit | 27e0f06b17b59e5de7db94ec1d0e74369536373a (patch) | |
| tree | c9dcaf1dddc64755ef1db3203230adc9819a3895 /plugins/imtcp/imtcp.c | |
| parent | bfae69d68b0032a383821a54bc52aeff36a90e52 (diff) | |
| parent | 3495720a2f6bc69ccba4c0d978ee815812cc9b75 (diff) | |
| download | rsyslog-27e0f06b17b59e5de7db94ec1d0e74369536373a.tar.gz rsyslog-27e0f06b17b59e5de7db94ec1d0e74369536373a.tar.bz2 rsyslog-27e0f06b17b59e5de7db94ec1d0e74369536373a.zip | |
Merge branch 'v6-stable-newmsglock' into v7-stable-newmsglock
Conflicts:
tools/syslogd.c
Diffstat (limited to 'plugins/imtcp/imtcp.c')
0 files changed, 0 insertions, 0 deletions