diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-01 17:00:07 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-01 17:00:07 +0200 |
| commit | d33a48656094bde5f190abb15588a6e5b930b6eb (patch) | |
| tree | ac58edb9f7225021eed362e51b478c8fb43ad01d /runtime/rsyslog.h | |
| parent | 176f773a2e7d29d45e06980e684d293fa3352d72 (diff) | |
| parent | cb9761627630dc8aeafbbfcfe091f87b66b5a92a (diff) | |
| download | rsyslog-d33a48656094bde5f190abb15588a6e5b930b6eb.tar.gz rsyslog-d33a48656094bde5f190abb15588a6e5b930b6eb.tar.xz rsyslog-d33a48656094bde5f190abb15588a6e5b930b6eb.zip | |
Merge branch 'v4-stable' into v4-beta
Conflicts:
runtime/rsyslog.h
tools/syslogd.c
Diffstat (limited to 'runtime/rsyslog.h')
0 files changed, 0 insertions, 0 deletions