diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-10 15:37:22 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-10 15:37:22 +0200 |
| commit | de10acc9db91b331b096d74adf355c6f1956484f (patch) | |
| tree | 17b8398c37ae537b89a087014c0e005d26f10ee0 /README | |
| parent | 6e1f0d4f70073b4a52f94d7bfe7afa82a3b5075e (diff) | |
| parent | 78e9c7c4d2c4ec09cce403066f09a5a7e08e994e (diff) | |
| download | rsyslog-de10acc9db91b331b096d74adf355c6f1956484f.tar.gz rsyslog-de10acc9db91b331b096d74adf355c6f1956484f.tar.xz rsyslog-de10acc9db91b331b096d74adf355c6f1956484f.zip | |
Merge branch 'v4-beta' into beta
Conflicts:
action.c
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions