diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-21 04:29:53 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-05-21 04:29:53 +0200 |
| commit | 780e2d37e4d27f040d15e09b25542d6808a19436 (patch) | |
| tree | ed63ad693d64961c3db56a423827e83e9760b156 /runtime/conf.c | |
| parent | 503dec99f2e21fba336c989b209fadbf201e6f7e (diff) | |
| parent | 715b9fe052f5a7c622a1f71f905461e06e398de8 (diff) | |
| download | rsyslog-780e2d37e4d27f040d15e09b25542d6808a19436.tar.gz rsyslog-780e2d37e4d27f040d15e09b25542d6808a19436.tar.xz rsyslog-780e2d37e4d27f040d15e09b25542d6808a19436.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
plugins/imrelp/imrelp.c
Diffstat (limited to 'runtime/conf.c')
0 files changed, 0 insertions, 0 deletions