diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 14:21:35 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 14:21:35 +0100 |
commit | 7dfc7c709ffe09669e8c79661faea21451cca603 (patch) | |
tree | 9e9367b2263734885ece3be9b7d68b8bab0a5926 /runtime/msg.c | |
parent | 409cd9496b08be6270c69e34374e94379ed0e4b9 (diff) | |
parent | e6e1ff65bcb577df238c9c24d55909bca6febbb3 (diff) | |
download | rsyslog-7dfc7c709ffe09669e8c79661faea21451cca603.tar.gz rsyslog-7dfc7c709ffe09669e8c79661faea21451cca603.tar.xz rsyslog-7dfc7c709ffe09669e8c79661faea21451cca603.zip |
Merge branch 'beta'
Conflicts:
ChangeLog
doc/v6compatibility.html
Diffstat (limited to 'runtime/msg.c')
0 files changed, 0 insertions, 0 deletions