diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-06 12:55:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-06 12:55:09 +0200 |
| commit | 0c786a66ac929d35a8057d232dad5a53d749e789 (patch) | |
| tree | 064cb765c5223e78d87c81dc9e9610a5561805ab /runtime/queue.c | |
| parent | 74b81c8c01b26a142793a4861340996ed956f5f6 (diff) | |
| parent | 9aec3a6e5f26c72005dc773d3e86915497cd4e4c (diff) | |
| download | rsyslog-0c786a66ac929d35a8057d232dad5a53d749e789.tar.gz rsyslog-0c786a66ac929d35a8057d232dad5a53d749e789.tar.bz2 rsyslog-0c786a66ac929d35a8057d232dad5a53d749e789.zip | |
Merge branch 'v6-stable' into v6-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/queue.c')
0 files changed, 0 insertions, 0 deletions