diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-25 16:21:01 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-25 16:21:01 +0200 |
| commit | c7b309a662a4310a8b878c036d9440e0b2e345a8 (patch) | |
| tree | 17868591721a1cde29e5e9cfaadd92883478ad4a /runtime/rsyslog.h | |
| parent | 4818b0081d3a265a87f9f646d79f2a2ffbcda819 (diff) | |
| parent | 1f79c785975261e4158c9b85f6451d5bd00b2495 (diff) | |
| download | rsyslog-c7b309a662a4310a8b878c036d9440e0b2e345a8.tar.gz rsyslog-c7b309a662a4310a8b878c036d9440e0b2e345a8.tar.xz rsyslog-c7b309a662a4310a8b878c036d9440e0b2e345a8.zip | |
Merge branch 'master' into v5-devel
Conflicts:
runtime/queue.c
Diffstat (limited to 'runtime/rsyslog.h')
0 files changed, 0 insertions, 0 deletions