summaryrefslogtreecommitdiffstats
path: root/solaris
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-03-25 15:48:05 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-03-25 15:48:05 +0100
commit0e0eaae4336cf2847a7deb76b974b73311f4acfd (patch)
tree6c62edec1bb739e4ac4f0ebbd2a50c1be8301f45 /solaris
parentec883905c13920de0bc33e5bdd0a75c80535b55c (diff)
parent93de3028b302adf3e3fb8e65bda5ca8bab59e9cd (diff)
downloadrsyslog-0e0eaae4336cf2847a7deb76b974b73311f4acfd.tar.gz
rsyslog-0e0eaae4336cf2847a7deb76b974b73311f4acfd.tar.xz
rsyslog-0e0eaae4336cf2847a7deb76b974b73311f4acfd.zip
Merge branch 'v4-stable' into v4-stable-solaris
Conflicts: ChangeLog
Diffstat (limited to 'solaris')
0 files changed, 0 insertions, 0 deletions