diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-18 13:55:16 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-18 13:55:16 +0100 |
| commit | c9b70abf1a7a40b5afc80975d016980dd4e63e36 (patch) | |
| tree | 33171a0c1dae68dc1ab650e3ab24bd973584cf84 /plugins/omstdout | |
| parent | fe4cfa6d1f37aaac61a7cbab03df30ac1909f5cf (diff) | |
| parent | 92f7e549df5a1333f037cf3b290e3087fd9ad5da (diff) | |
| download | rsyslog-c9b70abf1a7a40b5afc80975d016980dd4e63e36.tar.gz rsyslog-c9b70abf1a7a40b5afc80975d016980dd4e63e36.tar.xz rsyslog-c9b70abf1a7a40b5afc80975d016980dd4e63e36.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imptcp/imptcp.c
Diffstat (limited to 'plugins/omstdout')
0 files changed, 0 insertions, 0 deletions