diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-31 17:08:01 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-31 17:08:01 +0200 |
| commit | b30e809a202ef42e59a6c9e455e17ce56c7894bc (patch) | |
| tree | 23e0584c2a0cc1fecdd7f2c9af69f7482e7c915b /runtime/ctok_token.h | |
| parent | b615cbaacec3d6f25e448362095ac54fcbe6d927 (diff) | |
| parent | 945bc9bd0d9de984ab11b9faf609b809a1f3cb90 (diff) | |
| download | rsyslog-b30e809a202ef42e59a6c9e455e17ce56c7894bc.tar.gz rsyslog-b30e809a202ef42e59a6c9e455e17ce56c7894bc.tar.xz rsyslog-b30e809a202ef42e59a6c9e455e17ce56c7894bc.zip | |
Merge branch 'v5-devel'
Conflicts:
configure.ac
doc/manual.html
doc/rsyslog_conf.html
runtime/msg.c
runtime/rsyslog.h
template.c
Diffstat (limited to 'runtime/ctok_token.h')
0 files changed, 0 insertions, 0 deletions