diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-06-12 08:25:05 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-06-12 08:25:05 +0200 |
| commit | b003f8509150cd3a694610edb0ec72d8ca86b667 (patch) | |
| tree | 3dd0a905dbebcc9f2c494b1b5125d8991055e5ec /.gitignore | |
| parent | 7b93d930f2f194969ec24528c2c42d4eebba29f3 (diff) | |
| parent | 8080d3fef6c9d3f1452ff605e05748999b25aa32 (diff) | |
| download | rsyslog-b003f8509150cd3a694610edb0ec72d8ca86b667.tar.gz rsyslog-b003f8509150cd3a694610edb0ec72d8ca86b667.tar.xz rsyslog-b003f8509150cd3a694610edb0ec72d8ca86b667.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
plugins/imklog/linux.c
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions