diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 11:47:16 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 11:47:16 +0100 |
| commit | 3367446c0abfec6230c9f70277ddc7c7ecbacdf6 (patch) | |
| tree | acc296899eb8da0f5671e04d0234bc10971ac0a4 /Makefile.am | |
| parent | b826c0d3c53bc9da7014d8e75f6e3db8853b7c19 (diff) | |
| parent | 2227515764469d475d42d05ca7384cb227a8dce5 (diff) | |
| download | rsyslog-3367446c0abfec6230c9f70277ddc7c7ecbacdf6.tar.gz rsyslog-3367446c0abfec6230c9f70277ddc7c7ecbacdf6.tar.xz rsyslog-3367446c0abfec6230c9f70277ddc7c7ecbacdf6.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
configure.ac
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 ff8a0e86..9c77807d 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 \ |