diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-12 17:11:59 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-03-12 17:11:59 +0100 |
| commit | 32df7bf254f8e82f4857d9d0f5eeb49d678d08c8 (patch) | |
| tree | e4de394adc42e7ac52669fa0467dc94506e36781 /template.c | |
| parent | 7d509d53df75bc2146bddebcbab14583474ac543 (diff) | |
| parent | 0b5fe246b55635d8eaf3182ddad8961c7d3757c2 (diff) | |
| download | rsyslog-32df7bf254f8e82f4857d9d0f5eeb49d678d08c8.tar.gz rsyslog-32df7bf254f8e82f4857d9d0f5eeb49d678d08c8.tar.xz rsyslog-32df7bf254f8e82f4857d9d0f5eeb49d678d08c8.zip | |
Merge branch 'v6-stable'
Conflicts:
runtime/queue.c
Diffstat (limited to 'template.c')
0 files changed, 0 insertions, 0 deletions