diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:46:35 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-06 08:46:35 +0200 |
| commit | 76684243dcf8e48db6dda99eff7ea2c3a9f26a91 (patch) | |
| tree | b886dac91e9f70647a882ea3cf8b850ea83fb5e1 /tests/Makefile.am | |
| parent | a924cfe6c2da54829f4729d6d56f8a1cc402475e (diff) | |
| parent | 8cd429f7eeee548ff3d5a4d44daa22c2e5a1cf3a (diff) | |
| download | rsyslog-76684243dcf8e48db6dda99eff7ea2c3a9f26a91.tar.gz rsyslog-76684243dcf8e48db6dda99eff7ea2c3a9f26a91.tar.xz rsyslog-76684243dcf8e48db6dda99eff7ea2c3a9f26a91.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
Diffstat (limited to 'tests/Makefile.am')
0 files changed, 0 insertions, 0 deletions