diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-15 07:59:31 -0700 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-15 07:59:31 -0700 |
| commit | 3700a64d973f55e1cc8bd478e203f00d529ce27b (patch) | |
| tree | 872a07003a538ac9c7921476c89c1e01766ca8b7 /runtime/obj.c | |
| parent | 053656420eb67ec3f7ce0dc57dcb2d22e8cfa0f8 (diff) | |
| parent | c27a2ab6867897ec379ec1e9afb216c99070b33e (diff) | |
| download | rsyslog-3700a64d973f55e1cc8bd478e203f00d529ce27b.tar.gz rsyslog-3700a64d973f55e1cc8bd478e203f00d529ce27b.tar.xz rsyslog-3700a64d973f55e1cc8bd478e203f00d529ce27b.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
ChangeLog
runtime/stream.c
Diffstat (limited to 'runtime/obj.c')
0 files changed, 0 insertions, 0 deletions