diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-15 14:51:29 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-15 14:51:29 +0200 |
| commit | 90ef0f7a0b3cd025e30611cd30d72beaf86ff18b (patch) | |
| tree | fcd439784db76a2c39fc7ce43c53cfc5c02639fd /tcpsrv.c | |
| parent | 57722664bcdfcd7be425ad3db02a884ff8c17f47 (diff) | |
| parent | 72c235744023d10e1a9b44c90b65a6b34029e471 (diff) | |
| download | rsyslog-90ef0f7a0b3cd025e30611cd30d72beaf86ff18b.tar.gz rsyslog-90ef0f7a0b3cd025e30611cd30d72beaf86ff18b.tar.xz rsyslog-90ef0f7a0b3cd025e30611cd30d72beaf86ff18b.zip | |
Merge branch 'v5-devel'
Conflicts:
plugins/impstats/impstats.c
Diffstat (limited to 'tcpsrv.c')
0 files changed, 0 insertions, 0 deletions