diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-01-26 12:02:07 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-01-26 12:02:07 +0100 |
| commit | 939852b1cdfaed376342a3a0aa4b0fb7c14f55c5 (patch) | |
| tree | 68553cc6c04318978807e83ff408922ac5d2b461 /template.c | |
| parent | 8a3a6f4deb76218f24e79380db30904eef1feded (diff) | |
| parent | 7d098f14cba4f31dec7d92136183ebd0ccf7e1d0 (diff) | |
| download | rsyslog-939852b1cdfaed376342a3a0aa4b0fb7c14f55c5.tar.gz rsyslog-939852b1cdfaed376342a3a0aa4b0fb7c14f55c5.tar.xz rsyslog-939852b1cdfaed376342a3a0aa4b0fb7c14f55c5.zip | |
Merge branch 'v4-stable' into v4-beta
Conflicts:
runtime/queue.c
Diffstat (limited to 'template.c')
0 files changed, 0 insertions, 0 deletions