diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 17:13:08 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-04-19 17:13:08 +0200 |
commit | d3eb89a5fe1dbcda028c0ab5e6753578716539d7 (patch) | |
tree | 9a6da2266542fb772bc996b6d245403ecdfd126c /contrib | |
parent | 4e511087c413629120315fe5dd26f966ac1ef6fb (diff) | |
parent | 587036bfb03167d86b0a2fbfe998db1a916cabb3 (diff) | |
download | rsyslog-d3eb89a5fe1dbcda028c0ab5e6753578716539d7.tar.gz rsyslog-d3eb89a5fe1dbcda028c0ab5e6753578716539d7.tar.xz rsyslog-d3eb89a5fe1dbcda028c0ab5e6753578716539d7.zip |
Merge branch 'v4-devel' into master
Conflicts:
runtime/msg.h
Diffstat (limited to 'contrib')
0 files changed, 0 insertions, 0 deletions