diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-29 15:51:46 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-06-29 15:51:46 +0200 |
| commit | ba5f628cbb43d6a4add15c6fab50e35b5c54c5b8 (patch) | |
| tree | 74dbe259b64d8f6e839e5c99a7d99f2edaf32f2b /template.h | |
| parent | 40334847b685e6058be562b4436f72426637f4d8 (diff) | |
| parent | b397a80c88be0de6e7450bcbeb3524be98e572b6 (diff) | |
| download | rsyslog-ba5f628cbb43d6a4add15c6fab50e35b5c54c5b8.tar.gz rsyslog-ba5f628cbb43d6a4add15c6fab50e35b5c54c5b8.tar.xz rsyslog-ba5f628cbb43d6a4add15c6fab50e35b5c54c5b8.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
runtime/rsyslog.h
Diffstat (limited to 'template.h')
0 files changed, 0 insertions, 0 deletions