summaryrefslogtreecommitdiffstats
path: root/slackware
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-08-22 15:32:05 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-08-22 15:32:05 +0200
commit01fe0fd2ab8a19bdf61bda2256429726ba8e0b53 (patch)
tree22f2d50ae3f3d88ca2ec83f53dd9d6d2453b1817 /slackware
parent9faf2240c4a8f09f3f6c2c9bbd47e48520524e03 (diff)
parentd92ad440da788fea9f17bfa4b0185f12644bf714 (diff)
downloadrsyslog-01fe0fd2ab8a19bdf61bda2256429726ba8e0b53.tar.gz
rsyslog-01fe0fd2ab8a19bdf61bda2256429726ba8e0b53.tar.xz
rsyslog-01fe0fd2ab8a19bdf61bda2256429726ba8e0b53.zip
Merge branch 'v5-stable' into v5-beta
Conflicts: runtime/ruleset.c
Diffstat (limited to 'slackware')
0 files changed, 0 insertions, 0 deletions