summaryrefslogtreecommitdiff
path: root/grc/blocks/Makefile.am
diff options
context:
space:
mode:
authorTom2009-10-06 10:40:39 -0700
committerTom2009-10-06 10:40:39 -0700
commitbbd3df51732b2b63ae9d20e9fddd12229cf6b2ef (patch)
treedbf63fb638238e389ad970f2f4443299491e8fc6 /grc/blocks/Makefile.am
parent314726ae7457b37f442a2751285b75b0d616c0f4 (diff)
parent3f8026a00c261c788357b3a04f5b338a6cda4d0e (diff)
downloadgnuradio-bbd3df51732b2b63ae9d20e9fddd12229cf6b2ef.tar.gz
gnuradio-bbd3df51732b2b63ae9d20e9fddd12229cf6b2ef.tar.bz2
gnuradio-bbd3df51732b2b63ae9d20e9fddd12229cf6b2ef.zip
Merge branch 'master' into sync
Conflicts: gr-utils/src/python/gr_plot_qt.py gr-utils/src/python/pyqt_plot.py gr-utils/src/python/pyqt_plot.ui
Diffstat (limited to 'grc/blocks/Makefile.am')
-rw-r--r--grc/blocks/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 32ddc6567..617a3bf60 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -30,6 +30,8 @@ dist_ourdata_DATA = \
band_reject_filter.xml \
blks2_am_demod_cf.xml \
blks2_analysis_filterbank.xml \
+ blks2_cvsd_encode.xml \
+ blks2_cvsd_decode.xml \
blks2_dxpsk_demod.xml \
blks2_dxpsk_mod.xml \
blks2_error_rate.xml \