diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 14:44:12 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-07 14:44:12 +0200 |
| commit | d53016962da179c52ad22600bd54ffd58f86a81c (patch) | |
| tree | f557da4c02f73f13df76347078d7bc2388fdd89d /tcpsrv.c | |
| parent | cacb817fa3f6b78bad9e13f56d0fa1ed7d0366c1 (diff) | |
| parent | bd8d972a975ce794dd71c1c8db724991dd4744a0 (diff) | |
| download | rsyslog-d53016962da179c52ad22600bd54ffd58f86a81c.tar.gz rsyslog-d53016962da179c52ad22600bd54ffd58f86a81c.tar.xz rsyslog-d53016962da179c52ad22600bd54ffd58f86a81c.zip | |
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts:
configure.ac
doc/manual.html
Diffstat (limited to 'tcpsrv.c')
0 files changed, 0 insertions, 0 deletions