diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-04 15:17:23 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-04 15:17:23 +0200 |
| commit | 6d8df125979065640598bc9126258dc8645f748d (patch) | |
| tree | c625b87b1ad7586222e99410d784703aad7b8c95 /runtime/rsyslog.h | |
| parent | 1e9febaf28ffa1a6107cd0f5f2c0ac0ab2b16830 (diff) | |
| parent | d7cfdcf28c1239908619aadac6ef4fa43f1b93fd (diff) | |
| download | rsyslog-6d8df125979065640598bc9126258dc8645f748d.tar.gz rsyslog-6d8df125979065640598bc9126258dc8645f748d.tar.xz rsyslog-6d8df125979065640598bc9126258dc8645f748d.zip | |
Merge branch 'v3-stable' into v4-stable
Conflicts:
doc/rsyslog_conf.html
Diffstat (limited to 'runtime/rsyslog.h')
0 files changed, 0 insertions, 0 deletions