summaryrefslogtreecommitdiffstats
path: root/runtime/sd-daemon.h
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-01-10 18:04:01 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-01-10 18:04:01 +0100
commitd0a83a1f7a762010971a9f909a1e28a83fa7cf2c (patch)
tree3bb6451baa10296b0cd40fbf25cc2a16238358ee /runtime/sd-daemon.h
parent9b46ba1ad0a1de5268dcf0fc5be6a29417dda0a9 (diff)
parent545a80918b9a0cc75e12de4a9c718dc875a5276a (diff)
downloadrsyslog-d0a83a1f7a762010971a9f909a1e28a83fa7cf2c.tar.gz
rsyslog-d0a83a1f7a762010971a9f909a1e28a83fa7cf2c.tar.xz
rsyslog-d0a83a1f7a762010971a9f909a1e28a83fa7cf2c.zip
Merge branch 'v4-stable-tmp' into v5-devel-tmp
Conflicts: dirty.h tools/syslogd.c
Diffstat (limited to 'runtime/sd-daemon.h')
0 files changed, 0 insertions, 0 deletions