diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-12 13:21:46 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-11-12 13:21:46 +0100 |
| commit | 0fd8143d8719d08d9feb0a304bb352dd7c4bbab6 (patch) | |
| tree | b344fb400aabea95b2352ba13f51ae438a08d51a /template.c | |
| parent | 22bf4fc83274df41f9d490f522718f248e35c1f5 (diff) | |
| parent | 0a5b731f2f18168795bcdefd9b6fa562dce6a0d5 (diff) | |
| download | rsyslog-0fd8143d8719d08d9feb0a304bb352dd7c4bbab6.tar.gz rsyslog-0fd8143d8719d08d9feb0a304bb352dd7c4bbab6.tar.xz rsyslog-0fd8143d8719d08d9feb0a304bb352dd7c4bbab6.zip | |
Merge branch 'v4-stable' into v4-beta
Conflicts:
tests/Makefile.am
Diffstat (limited to 'template.c')
0 files changed, 0 insertions, 0 deletions