diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-21 12:15:44 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-21 12:15:44 +0100 |
| commit | ee4553948e042d992e07b63bc151bc8c1e229046 (patch) | |
| tree | 78bd0975ccd13fa310178e6a64b493baedef53e5 /tools/syslogd.c | |
| parent | 712cceda933c9e4bc1231f5beae4f09d1d416e7c (diff) | |
| parent | 639afa3d0aa9df1b12c2ab143be29c8281145c19 (diff) | |
| download | rsyslog-ee4553948e042d992e07b63bc151bc8c1e229046.tar.gz rsyslog-ee4553948e042d992e07b63bc151bc8c1e229046.tar.bz2 rsyslog-ee4553948e042d992e07b63bc151bc8c1e229046.zip | |
Merge branch 'v7-devel'
Conflicts:
runtime/queue.c
Diffstat (limited to 'tools/syslogd.c')
0 files changed, 0 insertions, 0 deletions