diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-01 16:01:32 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-01 16:01:32 +0100 |
| commit | 75a585a7e26d4d6cf59157cf62584c139af1527c (patch) | |
| tree | b7c29c3cb0234f70dcd64259c5b58c64a2311c75 /runtime/nsdpoll_ptcp.h | |
| parent | c130eb20215d5f4ed4fc23c4bf0223b77176617b (diff) | |
| parent | bd73f263b310c29d5e0b0dd541403bde44030b86 (diff) | |
| download | rsyslog-75a585a7e26d4d6cf59157cf62584c139af1527c.tar.gz rsyslog-75a585a7e26d4d6cf59157cf62584c139af1527c.tar.xz rsyslog-75a585a7e26d4d6cf59157cf62584c139af1527c.zip | |
Merge branch 'v5-beta'
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/nsdpoll_ptcp.h')
0 files changed, 0 insertions, 0 deletions