diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-09 09:15:14 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-03-09 09:15:14 +0100 |
| commit | de7726cbf0957384cc9261ac47d6bf65906739b5 (patch) | |
| tree | 1d3dd581d5c2382c01d3bf39130b368ae0cc64e2 /tools/omfile.c | |
| parent | a27c67a590a4a6186ac79326fa3abe4b95ab10fc (diff) | |
| parent | d97ad63e218112d7cd3a390854b2918407804976 (diff) | |
| download | rsyslog-de7726cbf0957384cc9261ac47d6bf65906739b5.tar.gz rsyslog-de7726cbf0957384cc9261ac47d6bf65906739b5.tar.xz rsyslog-de7726cbf0957384cc9261ac47d6bf65906739b5.zip | |
Merge branch 'v4-stable' into v5-stable
Conflicts:
ChangeLog
runtime/datetime.h
Diffstat (limited to 'tools/omfile.c')
0 files changed, 0 insertions, 0 deletions