summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-03-11 15:15:34 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-03-11 15:15:34 +0100
commitae7a01e137f14055f9472408d0cf3ebf9893afba (patch)
tree37af475499d6dd82b986f34c4a53db2ecbd071bd /runtime
parent24a36fd14226ccf5f139c07252f05f3db124604e (diff)
parent7f43af08fec0824c30c5bb1ddb9b96427828c987 (diff)
downloadrsyslog-ae7a01e137f14055f9472408d0cf3ebf9893afba.tar.gz
rsyslog-ae7a01e137f14055f9472408d0cf3ebf9893afba.tar.xz
rsyslog-ae7a01e137f14055f9472408d0cf3ebf9893afba.zip
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'runtime')
0 files changed, 0 insertions, 0 deletions