diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-27 17:49:35 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-11-27 17:49:35 +0100 |
| commit | 55834d95c993596c10d21515c12e2676d8606ef5 (patch) | |
| tree | a0f855d8f33263c6aae6b51de78215996dd55993 /runtime/module-template.h | |
| parent | f5926d4c2c12affd9b7e140e38777deae83751e2 (diff) | |
| parent | 48f646c149eaabf27909be0fddb06945c162e4b2 (diff) | |
| download | rsyslog-55834d95c993596c10d21515c12e2676d8606ef5.tar.gz rsyslog-55834d95c993596c10d21515c12e2676d8606ef5.tar.bz2 rsyslog-55834d95c993596c10d21515c12e2676d8606ef5.zip | |
Merge branch 'v7-devel'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/queue.c
Diffstat (limited to 'runtime/module-template.h')
0 files changed, 0 insertions, 0 deletions