diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 13:49:36 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-11 13:49:36 +0200 |
commit | 99b3b670e81bff0afc877f52cd261b354444aec1 (patch) | |
tree | 381447d88883777b46965db0dd3e75921b21d58a /tcpclt.h | |
parent | d72fe36f868ea12f246ed23bb81ece0240dd6c12 (diff) | |
parent | aef0aba9cd00fb225d2803210586b86a13547ce0 (diff) | |
download | rsyslog-99b3b670e81bff0afc877f52cd261b354444aec1.tar.gz rsyslog-99b3b670e81bff0afc877f52cd261b354444aec1.tar.xz rsyslog-99b3b670e81bff0afc877f52cd261b354444aec1.zip |
Merge branch 'master' into tmp
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/omudpspoof/omudpspoof.c
runtime/rsyslog.h
also updated omuxsock and imptcp to new interfaces
Diffstat (limited to 'tcpclt.h')
0 files changed, 0 insertions, 0 deletions