diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-16 16:25:45 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-16 16:25:45 +0100 |
| commit | 29807bb3c918603f41eeaa2d15e89852a2657f9c (patch) | |
| tree | 343c0856e562fac140eae3fabbb137ff39534fec /template.h | |
| parent | 17ee19bb5c15c666422358a215c118791b2cce7a (diff) | |
| parent | 18e60f46a1bbdbcb446369a0f03dbb04f29fb71e (diff) | |
| download | rsyslog-29807bb3c918603f41eeaa2d15e89852a2657f9c.tar.gz rsyslog-29807bb3c918603f41eeaa2d15e89852a2657f9c.tar.xz rsyslog-29807bb3c918603f41eeaa2d15e89852a2657f9c.zip | |
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts:
plugins/impstats/impstats.c
Diffstat (limited to 'template.h')
0 files changed, 0 insertions, 0 deletions