summaryrefslogtreecommitdiffstats
path: root/runtime/objomsr.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2010-02-10 16:35:12 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2010-02-10 16:35:12 +0100
commitc8ebe623376bc025bf166ec333ac874c215de816 (patch)
tree2e1c6f6a149bce3844ed21da08e5f0695de3fecc /runtime/objomsr.h
parent497bfeb287a75d1fb0f37502d3805307311a574d (diff)
parent76b3f2cd875dca755f4beee8dbf525c23d9730cf (diff)
downloadrsyslog-c8ebe623376bc025bf166ec333ac874c215de816.tar.gz
rsyslog-c8ebe623376bc025bf166ec333ac874c215de816.tar.xz
rsyslog-c8ebe623376bc025bf166ec333ac874c215de816.zip
Merge branch 'v4-beta' into beta
Conflicts: ChangeLog configure.ac doc/manual.html plugins/imuxsock/imuxsock.c template.c tests/Makefile.am tests/parsertest.sh
Diffstat (limited to 'runtime/objomsr.h')
0 files changed, 0 insertions, 0 deletions