diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-21 14:42:32 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-10-21 14:42:32 +0200 |
| commit | 12102199c4b3a042fb91e1d52eb274f06e62213e (patch) | |
| tree | 6e8d19a7a004bcc3fb03c2290a630281a846ff86 /tools/omshell.c | |
| parent | e61672c6932868d6b09ad0ae8453dc91c545742f (diff) | |
| parent | 5d67d98c35da731eab933dbfd858a0e009aa58de (diff) | |
| download | rsyslog-12102199c4b3a042fb91e1d52eb274f06e62213e.tar.gz rsyslog-12102199c4b3a042fb91e1d52eb274f06e62213e.tar.xz rsyslog-12102199c4b3a042fb91e1d52eb274f06e62213e.zip | |
Merge branch 'v5-stable' into v5-devel
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
Diffstat (limited to 'tools/omshell.c')
0 files changed, 0 insertions, 0 deletions