diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-01-23 10:18:17 +0100 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2015-01-23 10:51:26 +0100 |
| commit | e12c679b8cc8a263507c556cb24819dc0d5559b9 (patch) | |
| tree | 8f2cd06710d15ca64a4a86c1ce52bc975ec3f2b0 /Makefile.am | |
| parent | d82422fbb3d9d34a0566197245376548ce3ef14e (diff) | |
| parent | 94c1f63b6fd07d74f3325274dd19fd6beaf53965 (diff) | |
| download | dabmod-e12c679b8cc8a263507c556cb24819dc0d5559b9.tar.gz dabmod-e12c679b8cc8a263507c556cb24819dc0d5559b9.tar.bz2 dabmod-e12c679b8cc8a263507c556cb24819dc0d5559b9.zip | |
Merge raspine's ZeroMQ RC and UHD staticdelay
Merge raspine/master pull request, fix indentation, code style, and two
minor conflicts in:
doc/example.ini
src/DabMod.cpp
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index f599871..c0b3024 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ # Copyright (C) 2007, 2008, 2009, 2010 Her Majesty the Queen in Right # of Canada (Communications Research Center Canada) +# +# Copyright (C) 2014 Matthias P. Braendli, http://mpb.li # This file is part of ODR-DabMod. # @@ -16,8 +18,8 @@ # You should have received a copy of the GNU General Public License # along with ODR-DabMod. If not, see <http://www.gnu.org/licenses/>. -SUBDIRS =src lib +SUBDIRS = src lib ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST =COPYING NEWS README AUTHORS ChangeLog TODO doc +EXTRA_DIST = COPYING NEWS README.md AUTHORS ChangeLog TODO doc |