diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-18 14:51:33 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-18 14:51:33 +0100 |
| commit | 03be2fcd7cfe3355b8108fe8368a6a65ab98e9e9 (patch) | |
| tree | 5b56babfece1bc2f5e3ee6cbf030859b72232eca /plugins/ommail | |
| parent | ac9afc4149db314d9c480232d70216960342e3e4 (diff) | |
| parent | ef34821a2737799f48c3032b9616418e4f7fa34f (diff) | |
| download | rsyslog-03be2fcd7cfe3355b8108fe8368a6a65ab98e9e9.tar.gz rsyslog-03be2fcd7cfe3355b8108fe8368a6a65ab98e9e9.tar.xz rsyslog-03be2fcd7cfe3355b8108fe8368a6a65ab98e9e9.zip | |
Merge branch 'v5-devel' into master
Conflicts:
ChangeLog
Makefile.am
configure.ac
doc/manual.html
plugins/imptcp/imptcp.c
plugins/imudp/imudp.c
plugins/imuxsock/imuxsock.c
runtime/parser.c
template.c
tools/omfwd.c
tools/syslogd.c
Diffstat (limited to 'plugins/ommail')
0 files changed, 0 insertions, 0 deletions