summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-01-21 17:18:16 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-01-21 17:18:16 +0100
commita418fb87ee078456e0761ddb676542c192ae8f04 (patch)
tree4290712d00046020ffc39d8fe96c5def8a34ce2e /Makefile.am
parent92f7e549df5a1333f037cf3b290e3087fd9ad5da (diff)
parente4c6373b4fc55af346fc091fd9782326a00b9128 (diff)
downloadrsyslog-a418fb87ee078456e0761ddb676542c192ae8f04.tar.gz
rsyslog-a418fb87ee078456e0761ddb676542c192ae8f04.tar.xz
rsyslog-a418fb87ee078456e0761ddb676542c192ae8f04.zip
Merge branch 'v4-stable' into v5-stable
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index de4777b2..48eb26ce 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 \