diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-19 09:32:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-19 09:32:58 +0200 |
| commit | 16e3921905bb0b3f48b0b387e750d0f40439d634 (patch) | |
| tree | c14bcb440f4cd0efffe34d7cc9edbe9bae138d74 /dirty.h | |
| parent | d4690ae053b1b26fd215485f08875d508d7c4eba (diff) | |
| parent | d36407c7947ba119c971427e1528122509bf895f (diff) | |
| download | rsyslog-16e3921905bb0b3f48b0b387e750d0f40439d634.tar.gz rsyslog-16e3921905bb0b3f48b0b387e750d0f40439d634.tar.xz rsyslog-16e3921905bb0b3f48b0b387e750d0f40439d634.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
runtime/nsdpoll_ptcp.c
Diffstat (limited to 'dirty.h')
0 files changed, 0 insertions, 0 deletions