Rainer Gerhards 6624ad434b Merge branch 'v6-stable-noscoping' into master ...

Conflicts:
	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imfile/imfile.c
	plugins/imklog/imklog.c
	plugins/immark/immark.c
	plugins/imptcp/imptcp.c
	plugins/imrelp/imrelp.c
	plugins/imtcp/imtcp.c
	plugins/imtemplate/imtemplate.c
	plugins/imudp/imudp.c
	plugins/imuxsock/imuxsock.c
	plugins/mmsnmptrapd/mmsnmptrapd.c
	plugins/omtemplate/omtemplate.c
	runtime/glbl.c
	runtime/parser.c
	tools/omfile.c
	tools/syslogd.c

2012-01-19 13:07:46 +01:00

..

imdiag.c

Merge branch 'v6-stable-noscoping' into master

2012-01-19 13:07:46 +01:00

Makefile.am

make all cflags and libs variables uppercase

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