diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-17 13:20:55 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-17 13:20:55 +0100 |
| commit | bcc3b2aef74534cebc39f1351927756d144a7942 (patch) | |
| tree | 9c182438089a48f4653be0a34cc6105348d26dfb /java/com | |
| parent | b9cc60deeb0201e263ee011a20b0bce4eb6001f4 (diff) | |
| parent | 68c13f3f6a691c7f854e6fa4caff43295896dbde (diff) | |
| download | rsyslog-bcc3b2aef74534cebc39f1351927756d144a7942.tar.gz rsyslog-bcc3b2aef74534cebc39f1351927756d144a7942.tar.xz rsyslog-bcc3b2aef74534cebc39f1351927756d144a7942.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
action.c
plugins/imudp/imudp.c
runtime/glbl.c
Diffstat (limited to 'java/com')
0 files changed, 0 insertions, 0 deletions