summaryrefslogtreecommitdiffstats
path: root/runtime/msg.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-10-11 15:38:09 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-10-11 15:38:09 +0200
commit7bebfd3b60894bd913e3d6cbcad5447a607e0a0b (patch)
tree4243c632639de11ccb08eebd014851f1bc3f6711 /runtime/msg.c
parent156382746626459aaf64d79eac95183d1ab60680 (diff)
parent2ae9e456db8991e61b4aa48cf9b74f6d20689ce4 (diff)
downloadrsyslog-7bebfd3b60894bd913e3d6cbcad5447a607e0a0b.tar.gz
rsyslog-7bebfd3b60894bd913e3d6cbcad5447a607e0a0b.tar.bz2
rsyslog-7bebfd3b60894bd913e3d6cbcad5447a607e0a0b.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/manual.html
Diffstat (limited to 'runtime/msg.c')
0 files changed, 0 insertions, 0 deletions