diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-11 15:53:39 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-11 15:53:39 +0200 |
| commit | f4102989426e2c1b127f28c7d5a45d2dd4ea70f8 (patch) | |
| tree | a17b30bc936fad14bc437d2db943b5efd045dc43 /doc/Makefile.am | |
| parent | 3a8a1e1fac090097853462ac2016bb1442fa8734 (diff) | |
| parent | 0b7eaa413a58aa3d92e9c4f384029c9393e00250 (diff) | |
| download | rsyslog-f4102989426e2c1b127f28c7d5a45d2dd4ea70f8.tar.gz rsyslog-f4102989426e2c1b127f28c7d5a45d2dd4ea70f8.tar.xz rsyslog-f4102989426e2c1b127f28c7d5a45d2dd4ea70f8.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
rsyslog.conf
runtime/queue.c
Diffstat (limited to 'doc/Makefile.am')
0 files changed, 0 insertions, 0 deletions