diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-17 09:40:43 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-17 09:40:43 +0100 |
| commit | d8b3669e6d790c916afc0fa228e3cd7ac8d40063 (patch) | |
| tree | 27d76f8d3eeccceee502c1003ec5c4da1c0b3f4e /ChangeLog | |
| parent | 96790ad40308f031e9dfa218d7e48d4c16154f9e (diff) | |
| parent | dd40c7ff901d7d7414cda5cf60da647d450ed741 (diff) | |
| download | rsyslog-d8b3669e6d790c916afc0fa228e3cd7ac8d40063.tar.gz rsyslog-d8b3669e6d790c916afc0fa228e3cd7ac8d40063.tar.xz rsyslog-d8b3669e6d790c916afc0fa228e3cd7ac8d40063.zip | |
Merge branch 'v3-stable' into v4-stable
Conflicts:
doc/rsyslog_conf.html
runtime/net.c
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions