diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-25 14:33:27 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-02-25 14:33:27 +0100 |
commit | 89092a5e4a4ae2f162a3eb164125cf668ad10bfc (patch) | |
tree | b3a256699cd82d83562c07977a5b083a0f39a46b /plugins/imtcp | |
parent | b3eaf151087723bef45c5196e7a0f806246e9b82 (diff) | |
parent | 76ded5e98bd51d5de306f21f8abd28ee3b006be2 (diff) | |
download | rsyslog-89092a5e4a4ae2f162a3eb164125cf668ad10bfc.tar.gz rsyslog-89092a5e4a4ae2f162a3eb164125cf668ad10bfc.tar.xz rsyslog-89092a5e4a4ae2f162a3eb164125cf668ad10bfc.zip |
Merge branch 'v4-stable' into tmp
Conflicts:
configure.ac
doc/manual.html
Diffstat (limited to 'plugins/imtcp')
0 files changed, 0 insertions, 0 deletions