summaryrefslogtreecommitdiffstats
path: root/slackware
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-06-29 12:47:43 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-06-29 12:47:43 +0200
commit151c22e579d6de345d9ac7971ba1ba2f41b88976 (patch)
treecb77b8db83c306852b4e40618bad148e1c8b2517 /slackware
parent4822715a6e1ecc48d50a5450f93f02f785b8745a (diff)
parent8515376ac9b8549a4b93d87455df626cca0199b7 (diff)
downloadrsyslog-151c22e579d6de345d9ac7971ba1ba2f41b88976.tar.gz
rsyslog-151c22e579d6de345d9ac7971ba1ba2f41b88976.tar.xz
rsyslog-151c22e579d6de345d9ac7971ba1ba2f41b88976.zip
Merge branch 'beta' into master
Conflicts: tools/syslogd.c
Diffstat (limited to 'slackware')
0 files changed, 0 insertions, 0 deletions