diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-26 14:47:21 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-09-26 14:47:21 +0200 |
| commit | 1f8c579badcc777bb7012675a39d3e13cbaf818e (patch) | |
| tree | 7ca06bc2482469c65fccb2392ca0996465fb4cf6 /runtime/rsyslog.h | |
| parent | a8b1e96d7bf91d97646789c1805587ca1ebba3e9 (diff) | |
| parent | 9c8f4f49b02f2d92e618e7b70a9e23a3c8d4c8aa (diff) | |
| download | rsyslog-1f8c579badcc777bb7012675a39d3e13cbaf818e.tar.gz rsyslog-1f8c579badcc777bb7012675a39d3e13cbaf818e.tar.bz2 rsyslog-1f8c579badcc777bb7012675a39d3e13cbaf818e.zip | |
Merge branch 'v7-stable'
Conflicts:
plugins/omprog/omprog.c
Diffstat (limited to 'runtime/rsyslog.h')
0 files changed, 0 insertions, 0 deletions