diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-24 17:43:45 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-24 17:43:45 +0200 |
| commit | 4b05bef636c11cbaf4d32097ed9656a1447ed3d0 (patch) | |
| tree | 15c698fa86a85e5e3a1db1f14e2eaf6f11c6948f /template.h | |
| parent | 82095efa24ea0692a6747d4296f398ebd37e5339 (diff) | |
| parent | a7040a9623e228043209da897dbf30b9ab02d771 (diff) | |
| download | rsyslog-4b05bef636c11cbaf4d32097ed9656a1447ed3d0.tar.gz rsyslog-4b05bef636c11cbaf4d32097ed9656a1447ed3d0.tar.xz rsyslog-4b05bef636c11cbaf4d32097ed9656a1447ed3d0.zip | |
Merge branch 'sock-abstract' into tls
Conflicts:
runtime/Makefile.am
runtime/netstrm.c
runtime/nsd.h
runtime/nsd_ptcp.c
runtime/rsyslog.h
Diffstat (limited to 'template.h')
0 files changed, 0 insertions, 0 deletions