diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-12 11:48:09 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-12 11:48:09 +0200 |
| commit | 92a782dd2fc85c233f7144d86970321f2bfee588 (patch) | |
| tree | 06156dc4e1665a38cedf56d2c4fa4b4f2778b440 /configure.ac | |
| parent | 12a433e000cab7ab1737df479aefbaeccab0dc09 (diff) | |
| parent | 9105946272e4190e042981f35994b3f044ebb0d3 (diff) | |
| download | rsyslog-92a782dd2fc85c233f7144d86970321f2bfee588.tar.gz rsyslog-92a782dd2fc85c233f7144d86970321f2bfee588.tar.xz rsyslog-92a782dd2fc85c233f7144d86970321f2bfee588.zip | |
Merge branch 'v5-devel'
Conflicts:
configure.ac
doc/manual.html
plugins/imtcp/imtcp.c
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions