diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-15 11:07:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-15 11:07:59 +0200 |
| commit | 61ba5ff5955742b68a24d7b135ad07c29b48fa2f (patch) | |
| tree | da96436375c623133fef91bb6cb9185e735bb8d4 /Makefile.am | |
| parent | 63d4de81ec485425231676d53813ff465249e800 (diff) | |
| parent | b7fec51ba7b1042313b51dc27102fa0a9cebafb5 (diff) | |
| download | rsyslog-61ba5ff5955742b68a24d7b135ad07c29b48fa2f.tar.gz rsyslog-61ba5ff5955742b68a24d7b135ad07c29b48fa2f.tar.xz rsyslog-61ba5ff5955742b68a24d7b135ad07c29b48fa2f.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
configure.ac
doc/ommail.html
queue.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 6aea7600..d0341819 100644 --- a/Makefile.am +++ b/Makefile.am @@ -176,6 +176,7 @@ EXTRA_DIST = \ slackware/rc.rsyslogd \ contrib/README \ rsyslog.conf \ + COPYING.LESSER \ $(man_MANS) SUBDIRS = . doc |