Rainer Gerhards 4fd9852957 Merge branch 'beta' ...

Conflicts:

	ChangeLog
	conf.c
	doc/Makefile.am
	doc/manual.html
	omfwd.c
	plugins/omgssapi/omgssapi.c

This was a bit hard to merge; if there are problems, they
may be in the area of the new "comment in action line" code
that came from the beta.

2008-07-01 15:09:07 +02:00

..

gnutls

added a bit of doc (at least something...)

2008-05-08 13:24:20 +02:00

iminternal.c

some more cleanup

2008-04-16 15:27:53 +02:00

iminternal.h

some more cleanup

2008-04-16 15:27:53 +02:00

Makefile.am

begun building a testbench

2008-06-13 17:21:03 +02:00

omdiscard.c

some more cleanup

2008-04-16 15:27:53 +02:00

omdiscard.h

some more cleanup

2008-04-16 15:27:53 +02:00

omfile.c

added (internal) error codes to error messages

2008-06-27 12:52:45 +02:00

omfile.h

some more cleanup

2008-04-16 15:27:53 +02:00

omfwd.c

Merge branch 'beta'

2008-07-01 15:09:07 +02:00

omfwd.h

some more cleanup

2008-04-16 15:27:53 +02:00

omshell.c

added (internal) error codes to error messages

2008-06-27 12:52:45 +02:00

omshell.h

some more cleanup

2008-04-16 15:27:53 +02:00

omusrmsg.c

some more cleanup

2008-04-16 15:27:53 +02:00

omusrmsg.h

some more cleanup

2008-04-16 15:27:53 +02:00

pidfile.c

some more cleanup

2008-04-16 15:27:53 +02:00

pidfile.h

some more cleanup

2008-04-16 15:27:53 +02:00

rsyslog.conf.5

some more cleanup

2008-04-16 15:27:53 +02:00

rsyslogd.8

some more cleanup

2008-04-16 15:27:53 +02:00

syslogd.c

added (internal) error codes to error messages

2008-06-27 12:52:45 +02:00

syslogd.h

completed better modularity of runtime

2008-04-17 12:46:57 +02:00