diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-16 13:53:39 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-07-16 13:53:39 +0200 |
| commit | 511fd780a25b59b42e93bb2c9ebc03a4991f5c16 (patch) | |
| tree | 76f7b578ba2183d7d024197ec9abfd6702ed7af6 /runtime/objomsr.h | |
| parent | cb7f903730f097ebaa02dd12b3280a11e79b256b (diff) | |
| parent | 8788a04fbed4c05c0c4d28ad060260af226e1e6e (diff) | |
| download | rsyslog-511fd780a25b59b42e93bb2c9ebc03a4991f5c16.tar.gz rsyslog-511fd780a25b59b42e93bb2c9ebc03a4991f5c16.tar.xz rsyslog-511fd780a25b59b42e93bb2c9ebc03a4991f5c16.zip | |
Merge branch 'beta'
Conflicts:
runtime/wti.c
runtime/wtp.c
Diffstat (limited to 'runtime/objomsr.h')
0 files changed, 0 insertions, 0 deletions