Rainer Gerhards 8488d8c3c1 Merge branch 'v5-devel' ...

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imfile/imfile.c
	plugins/imklog/imklog.c
	plugins/imptcp/imptcp.c
	plugins/imtcp/imtcp.c
	plugins/imuxsock/imuxsock.c
	plugins/mmsnmptrapd/mmsnmptrapd.c
	tools/omfile.c

2011-06-27 12:33:26 +02:00

..

imtcp.c

Merge branch 'v5-devel'

2011-06-27 12:33:26 +02:00

Makefile.am

make all cflags and libs variables uppercase

2009-02-24 13:09:44 +01:00