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-digital/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-digital/grc')
| -rw-r--r-- | gr-digital/grc/.gitignore | 2 | ||||
| -rw-r--r-- | gr-digital/grc/Makefile.am | 57 |
2 files changed, 0 insertions, 59 deletions
diff --git a/gr-digital/grc/.gitignore b/gr-digital/grc/.gitignore deleted file mode 100644 index 3dda72986..000000000 --- a/gr-digital/grc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile.in -Makefile diff --git a/gr-digital/grc/Makefile.am b/gr-digital/grc/Makefile.am deleted file mode 100644 index 029eeece2..000000000 --- a/gr-digital/grc/Makefile.am +++ /dev/null @@ -1,57 +0,0 @@ -# -# Copyright 2011 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 = \ - digital_block_tree.xml \ - digital_binary_slicer_fb.xml \ - digital_clock_recovery_mm_xx.xml \ - digital_constellation_decoder_cb.xml \ - digital_constellation_receiver_cb.xml \ - digital_correlate_access_code_bb.xml \ - digital_costas_loop_cc.xml \ - digital_cma_equalizer_cc.xml \ - digital_cpmmod_bc.xml \ - digital_fll_band_edge_cc.xml \ - digital_gmsk_demod.xml \ - digital_gmsk_mod.xml \ - digital_gmskmod_bc.xml \ - digital_kurtotic_equalizer_cc.xml \ - digital_lms_dd_equalizer_cc.xml \ - digital_mpsk_receiver_cc.xml \ - digital_mpsk_snr_est_cc.xml \ - digital_probe_mpsk_snr_est_c.xml \ - digital_dxpsk_mod.xml \ - digital_dxpsk_demod.xml \ - digital_psk_mod.xml \ - digital_psk_demod.xml \ - digital_qam_mod.xml \ - digital_qam_demod.xml \ - digital_ofdm_mod.xml \ - digital_ofdm_demod.xml \ - digital_ofdm_cyclic_prefixer.xml \ - digital_ofdm_frame_acquisition.xml \ - digital_ofdm_insert_preamble.xml \ - digital_ofdm_sampler.xml \ - digital_ofdm_sync_pn.xml |