diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 08:32:06 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-08-05 08:32:06 +0200 |
| commit | d51aefc052377a2cee103a4d87c7c8dcf8c74081 (patch) | |
| tree | 44f3f02fd9a02af0b74cc7062a0215015e088c68 /doc | |
| parent | 3c1895a699f7d37b49f41f6f758ead4abea0caf2 (diff) | |
| parent | f2ec2e9b206b2f8a30417f303017ae0567cbbc0e (diff) | |
| download | rsyslog-d51aefc052377a2cee103a4d87c7c8dcf8c74081.tar.gz rsyslog-d51aefc052377a2cee103a4d87c7c8dcf8c74081.tar.xz rsyslog-d51aefc052377a2cee103a4d87c7c8dcf8c74081.zip | |
Merge branch 'v3-stable' into v4-stable
Conflicts:
runtime/conf.c
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions