diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 11:24:08 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 11:24:08 +0200 |
| commit | 3b63b155ed5e4d58858baa3d6f07293099d8a4e5 (patch) | |
| tree | 38e8065408eddf7acfdb5172d5a9b364bd436d72 /AUTHORS | |
| parent | b035298e30a5caebbf9dbb7b57ad4e17497b2abf (diff) | |
| parent | 4e11040e04c7147f9787e2a496591f7ada190480 (diff) | |
| download | rsyslog-3b63b155ed5e4d58858baa3d6f07293099d8a4e5.tar.gz rsyslog-3b63b155ed5e4d58858baa3d6f07293099d8a4e5.tar.xz rsyslog-3b63b155ed5e4d58858baa3d6f07293099d8a4e5.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions