Rainer Gerhards 1ac20ffe97 Merge branch 'v5-stable-prifix' into v7-stable-prifix ...

Conflicts:
	plugins/imklog/imklog.c
	plugins/imtemplate/imtemplate.c
	plugins/imuxsock/imuxsock.c
	runtime/msg.c
	runtime/rsyslog.h
	runtime/rule.c
	runtime/syslogd-types.h
	tools/syslogd.c

2014-09-16 14:48:29 +02:00

..

bsd.c

bugfix: add a missing pointer assignment

2014-07-11 15:19:43 +02:00

imklog.c

Merge branch 'v5-stable-prifix' into v7-stable-prifix

2014-09-16 14:48:29 +02:00

imklog.h

Merge branch 'v7-stable'

2012-11-22 11:05:45 +01:00

Makefile.am

refactored imklog linux driver, now combined with BSD driver

2012-01-23 18:05:07 +01:00

solaris_cddl.c

imklog: use memmove instead of memcpy (solaris)

2012-10-17 15:04:43 +02:00

solaris_cddl.h

some cleanup of solaris imklog

2010-04-12 17:09:50 +02:00

solaris.c

added support for obtaining timestamp for kernel message from message

2011-06-24 17:07:11 +02:00