diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-01-26 13:03:19 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-01-26 13:03:19 +0100 |
commit | b231db5253d68f1b707433aa708497b898aeb4ac (patch) | |
tree | 5401028997306daf9749b4a2baa4c612dfc10470 /dirty.h | |
parent | 34a1bd0c1d78cb889424bdbc73ad693a70020ba1 (diff) | |
parent | 1100fd18b4ea7730daff95f2c3e5ceff9f92a3e3 (diff) | |
download | rsyslog-b231db5253d68f1b707433aa708497b898aeb4ac.tar.gz rsyslog-b231db5253d68f1b707433aa708497b898aeb4ac.tar.xz rsyslog-b231db5253d68f1b707433aa708497b898aeb4ac.zip |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'dirty.h')
0 files changed, 0 insertions, 0 deletions