summaryrefslogtreecommitdiffstats
path: root/tools/syslogd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-04-07 14:58:58 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-04-07 14:58:58 +0200
commit829385ce407433af0f7679eedb09357ad4055f2e (patch)
tree62e9576f42154c5ed29eb3a6c868a08e066e9f6f /tools/syslogd.c
parent010060289a729dd930ac04b72237f0ca0db9ea1d (diff)
parent0550512b28049c391be424ad518ed0debb77089e (diff)
downloadrsyslog-829385ce407433af0f7679eedb09357ad4055f2e.tar.gz
rsyslog-829385ce407433af0f7679eedb09357ad4055f2e.tar.xz
rsyslog-829385ce407433af0f7679eedb09357ad4055f2e.zip
Merge branch 'beta'
Conflicts: ChangeLog configure.ac doc/manual.html doc/rsyslog_conf.html
Diffstat (limited to 'tools/syslogd.c')
0 files changed, 0 insertions, 0 deletions