Merge branch 'v4-stable' into v5-stable
authorRainer Gerhards <rgerhards@adiscon.com>
Sat, 14 Jan 2012 17:32:40 +0000 (18:32 +0100)
committerRainer Gerhards <rgerhards@adiscon.com>
Sat, 14 Jan 2012 17:32:40 +0000 (18:32 +0100)
Conflicts:
plugins/imfile/imfile.c
plugins/omtesting/omtesting.c
tcpsrv.c
threads.c

30 files changed:
1  2 
action.h
outchannel.c
parse.c
parse.h
plugins/im3195/im3195.c
plugins/imdiag/imdiag.c
plugins/imfile/imfile.c
plugins/immark/immark.c
plugins/imrelp/imrelp.c
plugins/imtcp/imtcp.c
plugins/omlibdbi/omlibdbi.c
plugins/ommail/ommail.c
plugins/omprog/omprog.c
plugins/omrelp/omrelp.c
plugins/omsnmp/omsnmp.c
plugins/omstdout/omstdout.c
plugins/omtesting/omtesting.c
plugins/omuxsock/omuxsock.c
tcpclt.c
tcps_sess.c
tcpsrv.c
tcpsrv.h
threads.c
threads.h
tools/omdiscard.c
tools/omfile.c
tools/ompipe.c
tools/omshell.c
tools/omusrmsg.c
tools/syslogd.h

diff --cc action.h
Simple merge
diff --cc outchannel.c
Simple merge
diff --cc parse.c
Simple merge
diff --cc parse.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc tcpclt.c
Simple merge
diff --cc tcps_sess.c
Simple merge
diff --cc tcpsrv.c
Simple merge
diff --cc tcpsrv.h
Simple merge
diff --cc threads.c
Simple merge
diff --cc threads.h
Simple merge
Simple merge
diff --cc tools/omfile.c
Simple merge
diff --cc tools/ompipe.c
Simple merge
diff --cc tools/omshell.c
Simple merge
Simple merge
diff --cc tools/syslogd.h
Simple merge