diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-03 15:52:24 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-03 15:52:24 +0200 |
| commit | ea6570c993eee8cb3f3e22ae1d22e1674a3a1bcb (patch) | |
| tree | 65ff2264d92e4e4c429d23d90adac0fed498c2fc /doc/rsyslog_conf_global.html | |
| parent | 8cd291a0c9eab23fa020d6560715a32c3370f78b (diff) | |
| parent | 1e9febaf28ffa1a6107cd0f5f2c0ac0ab2b16830 (diff) | |
| download | rsyslog-ea6570c993eee8cb3f3e22ae1d22e1674a3a1bcb.tar.gz rsyslog-ea6570c993eee8cb3f3e22ae1d22e1674a3a1bcb.tar.xz rsyslog-ea6570c993eee8cb3f3e22ae1d22e1674a3a1bcb.zip | |
Merge branch 'v4-stable' into v4-beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'doc/rsyslog_conf_global.html')
0 files changed, 0 insertions, 0 deletions