summaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-08-13 15:01:43 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-08-13 15:01:43 +0200
commita61e548958044f9efa013b5911d130ae1930448f (patch)
treeffffceade2526bfdfc43c920b0311afb7b242b56 /README
parent66300192944fe2c4390e53549ed51b4b25e79524 (diff)
parent8eb888d049da12e1294a7688432b6325794ade32 (diff)
downloadrsyslog-a61e548958044f9efa013b5911d130ae1930448f.tar.gz
rsyslog-a61e548958044f9efa013b5911d130ae1930448f.tar.xz
rsyslog-a61e548958044f9efa013b5911d130ae1930448f.zip
Merge branch 'v3-stable' into beta
Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions