diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 13:52:27 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 13:52:27 +0100 |
| commit | 1773bfa14b271d3bcd7fd96bba0bae8028280b75 (patch) | |
| tree | 6d0d3eb60c9df2cc364ff612b8f13fab3a25e383 /doc/manual.html | |
| parent | 99a48039fba51cad2ee6a18a756079fbccab32a2 (diff) | |
| parent | 2a813afa41cfda63896002b037742a67678584ad (diff) | |
| download | rsyslog-1773bfa14b271d3bcd7fd96bba0bae8028280b75.tar.gz rsyslog-1773bfa14b271d3bcd7fd96bba0bae8028280b75.tar.xz rsyslog-1773bfa14b271d3bcd7fd96bba0bae8028280b75.zip | |
Merge branch 'v6-stable'
Conflicts:
plugins/imklog/imklog.c
plugins/imklog/imklog.h
runtime/conf.c
runtime/rsyslog.h
Diffstat (limited to 'doc/manual.html')
0 files changed, 0 insertions, 0 deletions