diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-04 17:43:16 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-04 17:43:16 +0100 |
commit | 94cab477f5f308e3e8f24a58c381c1c92377c697 (patch) | |
tree | 07b627ab7ee52e405870bce9262e82efdde99aab /runtime/vmstk.h | |
parent | a453c7d858779736621c336bc1973bbaf6d6d87a (diff) | |
parent | afdccceefa30306cf720a27efd5a29bcc5a916c9 (diff) | |
download | rsyslog-3.21.9.tar.gz rsyslog-3.21.9.tar.xz rsyslog-3.21.9.zip |
Merge branch 'v3-stable' into betav3.21.9
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imudp/imudp.c
Diffstat (limited to 'runtime/vmstk.h')
0 files changed, 0 insertions, 0 deletions