diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-08 15:23:25 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-08 15:23:25 +0200 |
| commit | cf906392c3039ffa2526316b44ff28bd1d899061 (patch) | |
| tree | 09c83a8866c917207b7d7130de1c88590c5f2b64 /doc/manual.html | |
| parent | 8e4ad77e54c9d9272cef41f71d94ae277965711e (diff) | |
| parent | 5221a1e42e16c8c39b48a4a1a18ee6322c38cd17 (diff) | |
| download | rsyslog-cf906392c3039ffa2526316b44ff28bd1d899061.tar.gz rsyslog-cf906392c3039ffa2526316b44ff28bd1d899061.tar.xz rsyslog-cf906392c3039ffa2526316b44ff28bd1d899061.zip | |
Merge branch 'v4-devel'
Conflicts:
runtime/debug.h
runtime/stream.c
Diffstat (limited to 'doc/manual.html')
0 files changed, 0 insertions, 0 deletions