diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-21 16:11:58 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-06-21 16:11:58 +0200 |
| commit | 2bd4e10a4dc909346d5a010edefb12c65ed77aec (patch) | |
| tree | 6c32f32c24a71777880249c52b82c58646d74c15 /.gitignore | |
| parent | 42d36fbf3a06bb10e966abe1bcd288d335c6ad18 (diff) | |
| parent | b71ef4abad365f95cf7adf3df14083940d531f1f (diff) | |
| download | rsyslog-2bd4e10a4dc909346d5a010edefb12c65ed77aec.tar.gz rsyslog-2bd4e10a4dc909346d5a010edefb12c65ed77aec.tar.xz rsyslog-2bd4e10a4dc909346d5a010edefb12c65ed77aec.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
tests/Makefile.am
tests/manytcp-too-few-tls.sh
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions