diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-02 11:56:34 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-09-02 11:56:34 +0200 |
commit | 2082d963975a88c8e4dee3a43b98d939f9a2323f (patch) | |
tree | 340aa3b7084ed619e994b8bed6edbe77e66c45b2 /runtime/module-template.h | |
parent | 9b46c03ce20c2d074bafdd68840461ed89b35ef4 (diff) | |
parent | fcc4d77dd371744530e46a29b7534e89cf8251c4 (diff) | |
download | rsyslog-2082d963975a88c8e4dee3a43b98d939f9a2323f.tar.gz rsyslog-2082d963975a88c8e4dee3a43b98d939f9a2323f.tar.xz rsyslog-2082d963975a88c8e4dee3a43b98d939f9a2323f.zip |
Merge branch 'v3-stable' into beta
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/module-template.h')
0 files changed, 0 insertions, 0 deletions