Rainer Gerhards a61e548958 Merge branch 'v3-stable' into beta ...

Conflicts:

	ChangeLog
	configure.ac
	doc/manual.html
	plugins/imuxsock/imuxsock.c

2008-08-13 15:01:43 +02:00

..

contrib

applied patch provided by varmojfekoj to support building ommysql in its

2007-09-26 10:24:14 +00:00

createDB.sql

applied patch provided by varmojfekoj to support building ommysql in its

2007-09-26 10:24:14 +00:00

Makefile.am

moved files to the runtime

2008-04-16 10:26:54 +02:00

ommysql.c

Merge branch 'v3-stable' into beta

2008-08-13 15:01:43 +02:00

ommysql.h

changed license to GPLv3 (for what is to become rsyslog v3)

2007-12-14 11:21:57 +00:00