diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 09:02:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 09:02:09 +0200 |
| commit | 53265e3c7403c290158b70f7efad2b9388a06e6c (patch) | |
| tree | 6fd45b1de23595348f5f011cff83b5877bac4d73 /runtime/rsyslog.h | |
| parent | 6afbb39ea197623688e36b74f81f5ec45d0b15ff (diff) | |
| parent | dc1dd284c28a863a0b000082aaeb62c39ff0e905 (diff) | |
| download | rsyslog-53265e3c7403c290158b70f7efad2b9388a06e6c.tar.gz rsyslog-53265e3c7403c290158b70f7efad2b9388a06e6c.tar.xz rsyslog-53265e3c7403c290158b70f7efad2b9388a06e6c.zip | |
Merge branch 'v4-stable' into v4-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/rsyslog.h')
0 files changed, 0 insertions, 0 deletions