diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-22 11:07:21 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-10-22 11:07:21 +0200 |
| commit | b6f496f8619b02c50d3f5ced34eff279244b6e9b (patch) | |
| tree | d534a1941848a4f9577076cd11330f3ee014033c /doc/Makefile.am | |
| parent | a27e249e445deecb1d9ef57fbbb203d71bf061dd (diff) | |
| parent | 162c9e91e970cc9475bc86ffd00fd1d939e1e487 (diff) | |
| download | rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.tar.gz rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.tar.xz rsyslog-b6f496f8619b02c50d3f5ced34eff279244b6e9b.zip | |
Merge branch 'master' into nextmaster
Conflicts:
ChangeLog
configure.ac
Diffstat (limited to 'doc/Makefile.am')
0 files changed, 0 insertions, 0 deletions