diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-14 14:24:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-14 14:24:59 +0200 |
| commit | c561994c108627c490729d98d671c45b4f9684e5 (patch) | |
| tree | a6b29ced552cba8c402af0d7401fb7ee5c569110 /tests/diagtalker.c | |
| parent | f4c5f0a4cc2b06865e048d7c7c716ca7ca2a3b06 (diff) | |
| parent | 28af40670e9dc1a85a24dfcbb093ddc1171e151f (diff) | |
| download | rsyslog-c561994c108627c490729d98d671c45b4f9684e5.tar.gz rsyslog-c561994c108627c490729d98d671c45b4f9684e5.tar.xz rsyslog-c561994c108627c490729d98d671c45b4f9684e5.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
tcpsrv.c
Diffstat (limited to 'tests/diagtalker.c')
0 files changed, 0 insertions, 0 deletions