diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 08:37:17 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 08:37:17 +0200 |
| commit | ae2d1c6fcb25867f2c6aa8e342a24afb43442e6a (patch) | |
| tree | 604931105a0cc07f66cc84bbfd8ca0c67af8d150 /doc/manual.html | |
| parent | 650f537761c7b8813ef82b0b8343e2f5e100b360 (diff) | |
| parent | d51aefc052377a2cee103a4d87c7c8dcf8c74081 (diff) | |
| download | rsyslog-ae2d1c6fcb25867f2c6aa8e342a24afb43442e6a.tar.gz rsyslog-ae2d1c6fcb25867f2c6aa8e342a24afb43442e6a.tar.xz rsyslog-ae2d1c6fcb25867f2c6aa8e342a24afb43442e6a.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'doc/manual.html')
0 files changed, 0 insertions, 0 deletions