diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-29 10:12:10 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-29 10:12:10 +0200 |
commit | b52b7a15168e43758a814b36b497f658ebb56ff3 (patch) | |
tree | ebe5d12ca0ac310798eaea6b3e2ff8e9a01fed24 /plugins/imudp | |
parent | a3a603ac59f1e25fbadf44938fd3abad03734e0a (diff) | |
parent | 8d8d1f01e1cd6ae372088a3ebddc27983e9a0185 (diff) | |
download | rsyslog-b52b7a15168e43758a814b36b497f658ebb56ff3.tar.gz rsyslog-b52b7a15168e43758a814b36b497f658ebb56ff3.tar.xz rsyslog-b52b7a15168e43758a814b36b497f658ebb56ff3.zip |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'plugins/imudp')
0 files changed, 0 insertions, 0 deletions