diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-13 15:55:46 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-13 15:55:46 +0200 |
| commit | fec2041e037426ac227ee619b59629e059099d05 (patch) | |
| tree | af59860c7b037b2ca0d7ce85a2384ab1b5ca3e04 /runtime/vmprg.h | |
| parent | 6511278082a7e1e9602385cd24cdb5e363cb702f (diff) | |
| parent | ef9722ec87c8a7ddb2d499c1e7863475d8790a94 (diff) | |
| download | rsyslog-fec2041e037426ac227ee619b59629e059099d05.tar.gz rsyslog-fec2041e037426ac227ee619b59629e059099d05.tar.xz rsyslog-fec2041e037426ac227ee619b59629e059099d05.zip | |
Merge branch 'v3-stable' into v4-stable
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/vmprg.h')
0 files changed, 0 insertions, 0 deletions