summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-05-29 17:40:48 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-05-29 17:40:48 +0200
commit3e2be47ed69d2b4ce21777a75ad6128592e84d1d (patch)
tree85efb0765fdd3c2143552e14037471422b759d66 /ChangeLog
parent02929c7bbf1189a4fc96e42fb127f2f04a279719 (diff)
parent2cf3b2fa3c5c5b6cbf104294c7fc8860bb49bac0 (diff)
downloadrsyslog-3e2be47ed69d2b4ce21777a75ad6128592e84d1d.tar.gz
rsyslog-3e2be47ed69d2b4ce21777a75ad6128592e84d1d.tar.xz
rsyslog-3e2be47ed69d2b4ce21777a75ad6128592e84d1d.zip
Merge branch 'v3-stable' into beta
Conflicts: runtime/rsyslog.h
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions