summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-10-02 09:21:25 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-10-02 09:21:25 +0200
commitf771764fab64ff1a31d73fadd9934f4316bb099c (patch)
tree076ce25d384286684ed4c7ac6c4ccd07803612a1 /tools
parentd33a48656094bde5f190abb15588a6e5b930b6eb (diff)
parent724ba2b27f4a2c583b3e257e33a2f0b4b9649ef1 (diff)
downloadrsyslog-f771764fab64ff1a31d73fadd9934f4316bb099c.tar.gz
rsyslog-f771764fab64ff1a31d73fadd9934f4316bb099c.tar.xz
rsyslog-f771764fab64ff1a31d73fadd9934f4316bb099c.zip
Merge branch 'aaron' into v4-beta
Conflicts: runtime/rsyslog.h
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions