Rainer Gerhards b30e809a20 Merge branch 'v5-devel' ...

Conflicts:
	configure.ac
	doc/manual.html
	doc/rsyslog_conf.html
	runtime/msg.c
	runtime/rsyslog.h
	template.c

2011-03-31 17:08:01 +02:00

..

imdiag.c

Merge branch 'v5-devel'

2011-03-31 17:08:01 +02:00

Makefile.am

make all cflags and libs variables uppercase

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