diff options
author | Johnathan Corgan | 2010-06-22 07:45:21 -0700 |
---|---|---|
committer | Johnathan Corgan | 2010-06-22 07:45:21 -0700 |
commit | 36389a6f6c5c84599757a140c83e59372f0350c9 (patch) | |
tree | a4c12d47d0c11cfca9f026434bdff08020c76202 /grc/blocks/Makefile.am | |
parent | 76eabccf014dfd1a055f2797179e3a4c0fe21d37 (diff) | |
parent | ec8ef957565226ec98830192544d7d5da68dbe23 (diff) | |
download | gnuradio-36389a6f6c5c84599757a140c83e59372f0350c9.tar.gz gnuradio-36389a6f6c5c84599757a140c83e59372f0350c9.tar.bz2 gnuradio-36389a6f6c5c84599757a140c83e59372f0350c9.zip |
Merge branch 'master' into next
Diffstat (limited to 'grc/blocks/Makefile.am')
-rw-r--r-- | grc/blocks/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index 2596eae45..18420a013 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -71,6 +71,7 @@ dist_ourdata_DATA = \ gr_agc2_xx.xml \ gr_agc_xx.xml \ gr_and_xx.xml \ + gr_and_const_xx.xml \ gr_argmax_xx.xml \ gr_binary_slicer_fb.xml \ gr_channel_model.xml \ |