diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-24 12:56:26 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-11-24 12:56:26 +0100 |
| commit | 9bd22d07818c0d3c6460e9ed67ef018bb6e62314 (patch) | |
| tree | 3d89ba3b461cdb6f13c84d3bc572c69b60cebf55 /doc/manual.html | |
| parent | ab6e674b0bae88d3a91a30f4e32fbb857096964f (diff) | |
| parent | 600bc06638f0508775be4a78bb85f15bd6025a2c (diff) | |
| download | rsyslog-9bd22d07818c0d3c6460e9ed67ef018bb6e62314.tar.gz rsyslog-9bd22d07818c0d3c6460e9ed67ef018bb6e62314.tar.xz rsyslog-9bd22d07818c0d3c6460e9ed67ef018bb6e62314.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
configure.ac
Diffstat (limited to 'doc/manual.html')
0 files changed, 0 insertions, 0 deletions