summaryrefslogtreecommitdiffstats
path: root/doc/manual.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-04-15 14:37:09 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-04-15 14:37:09 +0200
commite82c6eec6f91e9c212103d81fdd4b10028c9bf6a (patch)
tree157a358cdef97a1d5e97e9b446b9bf7ccfa95d26 /doc/manual.html
parent61ba5ff5955742b68a24d7b135ad07c29b48fa2f (diff)
parentb9198d251218f13803cf121c4ef5f69a0e850d24 (diff)
downloadrsyslog-e82c6eec6f91e9c212103d81fdd4b10028c9bf6a.tar.gz
rsyslog-e82c6eec6f91e9c212103d81fdd4b10028c9bf6a.tar.xz
rsyslog-e82c6eec6f91e9c212103d81fdd4b10028c9bf6a.zip
Merge branch 'bsd-port'
Conflicts: ChangeLog plugins/imklog/imklog.c
Diffstat (limited to 'doc/manual.html')
0 files changed, 0 insertions, 0 deletions