diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-10 15:22:51 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-12-10 15:22:51 +0100 |
| commit | cec70434052c19e3de5197f5ad363efb874afd61 (patch) | |
| tree | 1d105bc7f4f5335330375c44ba5bf86e43ba65fb /tools | |
| parent | 94cab477f5f308e3e8f24a58c381c1c92377c697 (diff) | |
| parent | 6b1a023f256030d19e12bbaeaeb236e4d664d90a (diff) | |
| download | rsyslog-cec70434052c19e3de5197f5ad363efb874afd61.tar.gz rsyslog-cec70434052c19e3de5197f5ad363efb874afd61.tar.xz rsyslog-cec70434052c19e3de5197f5ad363efb874afd61.zip | |
Merge branch 'v3-stable' into beta
Conflicts:
tools/syslogd.c
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions