diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-21 15:11:21 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-21 15:11:21 +0200 |
| commit | 242c263dc2eaa5c148d481503dae0498ee626103 (patch) | |
| tree | 3d64994a124fdc5b9346c4bfef4e4d8938d50603 /plugins/imuxsock/imuxsock.c | |
| parent | d5f78989d8fd2a3c11fd1e6ed1cd4d688b1e6728 (diff) | |
| parent | 86225089f2d0e82deb368e1688464e8ba84d24cf (diff) | |
| download | rsyslog-242c263dc2eaa5c148d481503dae0498ee626103.tar.gz rsyslog-242c263dc2eaa5c148d481503dae0498ee626103.tar.xz rsyslog-242c263dc2eaa5c148d481503dae0498ee626103.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'plugins/imuxsock/imuxsock.c')
0 files changed, 0 insertions, 0 deletions