diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-26 15:33:14 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-26 15:33:14 +0200 |
| commit | 876597296f27fa4a4beea81124d3e14369490acd (patch) | |
| tree | 50795596d141711ad7e045041613a3041d8974fc /runtime/rsyslog.c | |
| parent | d22f240bc3525f7e112ce44aea6b9f87f8a51c8a (diff) | |
| parent | 7ea63db2f9d6b375dc95696e47357d73927f2d3d (diff) | |
| download | rsyslog-876597296f27fa4a4beea81124d3e14369490acd.tar.gz rsyslog-876597296f27fa4a4beea81124d3e14369490acd.tar.xz rsyslog-876597296f27fa4a4beea81124d3e14369490acd.zip | |
Merge branch 'master' into v5-devel
Conflicts:
runtime/rsyslog.h
Diffstat (limited to 'runtime/rsyslog.c')
0 files changed, 0 insertions, 0 deletions