diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-14 15:09:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-14 15:09:41 +0200 |
| commit | fee33477845949c2f03000044b2dbc31382b48f1 (patch) | |
| tree | d8ed2472205504b72273b088486f01d42d4c98de /configure.ac | |
| parent | 7f0c927623b6425fee2c39b2d5207d7c36e32acd (diff) | |
| parent | 28af40670e9dc1a85a24dfcbb093ddc1171e151f (diff) | |
| download | rsyslog-fee33477845949c2f03000044b2dbc31382b48f1.tar.gz rsyslog-fee33477845949c2f03000044b2dbc31382b48f1.tar.xz rsyslog-fee33477845949c2f03000044b2dbc31382b48f1.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
runtime/nsd_gtls.c
tcpsrv.c
tests/Makefile.am
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions