diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-18 16:37:04 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-18 16:37:04 +0200 |
| commit | 30b0a28786c5c198223cf2fa354d906710f68e0a (patch) | |
| tree | 38e6027d5a9d2bf6d1e6424ff70ecc20ac6a6b6a /template.c | |
| parent | fba7f66590c6c60c1c08585d210734884654c912 (diff) | |
| parent | dac70ef76e14e677f11579b7d11d13ddd92c25c8 (diff) | |
| download | rsyslog-30b0a28786c5c198223cf2fa354d906710f68e0a.tar.gz rsyslog-30b0a28786c5c198223cf2fa354d906710f68e0a.tar.xz rsyslog-30b0a28786c5c198223cf2fa354d906710f68e0a.zip | |
Merge branch 'v6-stable'
Conflicts:
runtime/msg.c
runtime/ruleset.c
runtime/ruleset.h
Diffstat (limited to 'template.c')
0 files changed, 0 insertions, 0 deletions