diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 12:58:32 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 12:58:32 +0100 |
| commit | 2a813afa41cfda63896002b037742a67678584ad (patch) | |
| tree | 3b27af879f8e87fb5b60204ecdd512cb15803556 /Makefile.am | |
| parent | 1ae52ee0e386ee7991d65cd2ac46add2b84f3099 (diff) | |
| parent | 8716e36b12a851cbe6a8a3949dfdcad31aa5fc37 (diff) | |
| download | rsyslog-2a813afa41cfda63896002b037742a67678584ad.tar.gz rsyslog-2a813afa41cfda63896002b037742a67678584ad.tar.xz rsyslog-2a813afa41cfda63896002b037742a67678584ad.zip | |
Merge branch 'v5-stable' into v6-stable
Conflicts:
ChangeLog
plugins/omprog/omprog.c
runtime/rsyslog.h
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index d689b9ee..b7bbe1c5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,7 +60,9 @@ EXTRA_DIST = \ slackware/rc.rsyslogd \ contrib/README \ rsyslog.conf \ + COPYING \ COPYING.LESSER \ + COPYING.ASL20 \ contrib/gnutls/ca.pem \ contrib/gnutls/cert.pem \ contrib/gnutls/key.pem \ |