diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-02 09:21:25 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-02 09:21:25 +0200 |
| commit | f771764fab64ff1a31d73fadd9934f4316bb099c (patch) | |
| tree | 076ce25d384286684ed4c7ac6c4ccd07803612a1 /runtime/conf.c | |
| parent | d33a48656094bde5f190abb15588a6e5b930b6eb (diff) | |
| parent | 724ba2b27f4a2c583b3e257e33a2f0b4b9649ef1 (diff) | |
| download | rsyslog-f771764fab64ff1a31d73fadd9934f4316bb099c.tar.gz rsyslog-f771764fab64ff1a31d73fadd9934f4316bb099c.tar.xz rsyslog-f771764fab64ff1a31d73fadd9934f4316bb099c.zip | |
Merge branch 'aaron' into v4-beta
Conflicts:
runtime/rsyslog.h
Diffstat (limited to 'runtime/conf.c')
0 files changed, 0 insertions, 0 deletions