diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-06 09:17:27 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-06 09:17:27 +0200 |
| commit | ee403c2ad745039add6cd34ec1e9a55aa9d51160 (patch) | |
| tree | 0d5a6f5463d91a7fa160532e2f3e094590ff4506 /tools | |
| parent | 06633d3fac69a3d380b36ce728a6f2278561b4bb (diff) | |
| parent | ffdc33e3f178ad85ba5c2c9f7fcee98b743e9d5e (diff) | |
| download | rsyslog-ee403c2ad745039add6cd34ec1e9a55aa9d51160.tar.gz rsyslog-ee403c2ad745039add6cd34ec1e9a55aa9d51160.tar.xz rsyslog-ee403c2ad745039add6cd34ec1e9a55aa9d51160.zip | |
Merge branch 'v5-stable-imfile-batches' into v5-devel
Conflicts:
ChangeLog
configure.ac
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions