diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-07 15:19:18 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-09-07 15:19:18 +0200 |
| commit | b1e21fcb4b072b1780ce093e890450fe3a059de8 (patch) | |
| tree | 4b8185134aa09e75021fc64aa34a3a25ed84e3e2 /gss-misc.c | |
| parent | a808123d370cf965fc03ea7c04c042b67252a107 (diff) | |
| parent | d023d12bf9d3afa1957ad6bcb2c6e24dee2c22e9 (diff) | |
| download | rsyslog-b1e21fcb4b072b1780ce093e890450fe3a059de8.tar.gz rsyslog-b1e21fcb4b072b1780ce093e890450fe3a059de8.tar.xz rsyslog-b1e21fcb4b072b1780ce093e890450fe3a059de8.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imuxsock/imuxsock.c
Diffstat (limited to 'gss-misc.c')
0 files changed, 0 insertions, 0 deletions