diff options
author | Johnathan Corgan | 2012-04-07 19:32:10 -0700 |
---|---|---|
committer | Johnathan Corgan | 2012-04-07 19:32:10 -0700 |
commit | 9bef26c9271a7b9253075bda3c1fc7c8078c0343 (patch) | |
tree | a6c1329bb902c95c8ab9970f38ec5fb46d79167c /gr-noaa/grc | |
parent | f621a52f779381cfe550b4278b83e701a747944c (diff) | |
parent | ef72dc714840dfb8fe3f918dda243f74453b6cc7 (diff) | |
download | gnuradio-9bef26c9271a7b9253075bda3c1fc7c8078c0343.tar.gz gnuradio-9bef26c9271a7b9253075bda3c1fc7c8078c0343.tar.bz2 gnuradio-9bef26c9271a7b9253075bda3c1fc7c8078c0343.zip |
Merge branch 'next'
Diffstat (limited to 'gr-noaa/grc')
-rw-r--r-- | gr-noaa/grc/.gitignore | 1 | ||||
-rw-r--r-- | gr-noaa/grc/Makefile.am | 30 |
2 files changed, 0 insertions, 31 deletions
diff --git a/gr-noaa/grc/.gitignore b/gr-noaa/grc/.gitignore deleted file mode 100644 index 70845e08e..000000000 --- a/gr-noaa/grc/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Makefile.in diff --git a/gr-noaa/grc/Makefile.am b/gr-noaa/grc/Makefile.am deleted file mode 100644 index 73a028231..000000000 --- a/gr-noaa/grc/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright 2009 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -grcblocksdir = $(grc_blocksdir) - -dist_grcblocks_DATA = \ - noaa_hrpt_decoder.xml \ - noaa_hrpt_deframer.xml \ - noaa_hrpt_pll_cf.xml - |