diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-12 14:10:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-04-12 14:10:09 +0200 |
| commit | e4d87aac957ea639935f56fb8b03f3c03d037491 (patch) | |
| tree | b479a4ebfda4228355801dea625346e7a7e0798f /template.c | |
| parent | bd8d972a975ce794dd71c1c8db724991dd4744a0 (diff) | |
| parent | d749dadcc30e35448894a152fb0ddf77d60b8300 (diff) | |
| download | rsyslog-e4d87aac957ea639935f56fb8b03f3c03d037491.tar.gz rsyslog-e4d87aac957ea639935f56fb8b03f3c03d037491.tar.xz rsyslog-e4d87aac957ea639935f56fb8b03f3c03d037491.zip | |
Merge branch 'v5-stable' into v5-stable-newstats
Conflicts:
plugins/imuxsock/imuxsock.c
runtime/glbl.c
Diffstat (limited to 'template.c')
0 files changed, 0 insertions, 0 deletions