diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2011-08-05 14:22:46 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2011-08-05 14:22:46 +0200 |
| commit | ece1cb640926848d0d155f29b01a6406af441cb0 (patch) | |
| tree | 2c95c3a5a31ef0b8befcf3da38af23c5e583e84e /runtime/rsyslog.h | |
| parent | e86a4b8feb7796ebaa66c9f0a067eb6b104a089c (diff) | |
| parent | d788daafa4e8bda5fe544718b5f420f22cd79996 (diff) | |
| download | rsyslog-ece1cb640926848d0d155f29b01a6406af441cb0.tar.gz rsyslog-ece1cb640926848d0d155f29b01a6406af441cb0.tar.xz rsyslog-ece1cb640926848d0d155f29b01a6406af441cb0.zip | |
Merge branch 'v5-stable' into beta
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/rsyslog.h')
0 files changed, 0 insertions, 0 deletions