diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2011-08-05 14:09:08 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2011-08-05 14:09:08 +0200 |
| commit | a3953fbee90045b96bd5ef44b64883a6bff57fee (patch) | |
| tree | f89f77d1a51189c6e131b4a13a1d6faeb346b20f /runtime/obj.h | |
| parent | 1234d7c8cd5d76862510cff315ea965c4f978e55 (diff) | |
| parent | 3229fbeb1e1183141cbf2508334a52f6a082c40b (diff) | |
| download | rsyslog-a3953fbee90045b96bd5ef44b64883a6bff57fee.tar.gz rsyslog-a3953fbee90045b96bd5ef44b64883a6bff57fee.tar.xz rsyslog-a3953fbee90045b96bd5ef44b64883a6bff57fee.zip | |
Merge branch 'v3-stable' into v4-stable
Conflicts:
runtime/msg.c
Diffstat (limited to 'runtime/obj.h')
0 files changed, 0 insertions, 0 deletions