diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-15 14:30:18 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-15 14:30:18 +0200 |
commit | 65a449ded48ead4501bb7cb9ba7818124ad2f5e4 (patch) | |
tree | e1651ae61b1806530db55e941c19da0987133841 /runtime/stream.c | |
parent | 05cd77cd4d8f4c5a8dc0a8662c4dfe288230257d (diff) | |
parent | 4b6e93d382a622bffedbbaa6b87f94124987e2fd (diff) | |
download | rsyslog-65a449ded48ead4501bb7cb9ba7818124ad2f5e4.tar.gz rsyslog-65a449ded48ead4501bb7cb9ba7818124ad2f5e4.tar.xz rsyslog-65a449ded48ead4501bb7cb9ba7818124ad2f5e4.zip |
Merge branch 'detached' into master
Conflicts:
tests/nettester.c
Diffstat (limited to 'runtime/stream.c')
0 files changed, 0 insertions, 0 deletions