summaryrefslogtreecommitdiffstats
path: root/doc/imuxsock.html
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-09-04 15:30:15 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-09-04 15:30:15 +0200
commitc23c4c0a384fc10e9e2d2a506b40cc2dac7eb6c1 (patch)
tree261f6e04eba1d8c74816dd45ed2f4f2f859b4498 /doc/imuxsock.html
parent3fd7de85e18a5aee938de47823fcd96a830b95f7 (diff)
parentf4156b878f5e29d13bc4d98b78a7063008c6ad2b (diff)
downloadrsyslog-c23c4c0a384fc10e9e2d2a506b40cc2dac7eb6c1.tar.gz
rsyslog-c23c4c0a384fc10e9e2d2a506b40cc2dac7eb6c1.tar.xz
rsyslog-c23c4c0a384fc10e9e2d2a506b40cc2dac7eb6c1.zip
Merge branch 'master' into java
Conflicts: ChangeLog
Diffstat (limited to 'doc/imuxsock.html')
0 files changed, 0 insertions, 0 deletions