Rainer Gerhards 0957820a10 Merge branch 'v4-devel' ...

Conflicts:
	doc/rsyslog_conf_modules.html
	gss-misc.c
	plugins/imgssapi/imgssapi.c
	plugins/imudp/imudp.c
	plugins/imuxsock/imuxsock.c
	runtime/glbl.c
	runtime/glbl.h
	runtime/net.c

2009-11-17 10:38:46 +01:00

..

imudp.c

Merge branch 'v4-devel'

2009-11-17 10:38:46 +01:00

Makefile.am

make all cflags and libs variables uppercase

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