diff options
| author | Tom Rondeau | 2012-02-23 11:14:44 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2012-02-23 11:14:44 -0500 |
| commit | 5c6877db1b91ad6fafec9fce83bc7f9079493d39 (patch) | |
| tree | a0211bea9082fde6e25c5d9ac2f5e00e92b56183 /gr-vocoder/grc/vocoder_block_tree.xml | |
| parent | 4f0b3fbe765b9f4ce744e2c2c182715fc63756e2 (diff) | |
| parent | 330cddf31208b843c0997c6fb05cb3facf31f536 (diff) | |
| download | gnuradio-5c6877db1b91ad6fafec9fce83bc7f9079493d39.tar.gz gnuradio-5c6877db1b91ad6fafec9fce83bc7f9079493d39.tar.bz2 gnuradio-5c6877db1b91ad6fafec9fce83bc7f9079493d39.zip | |
Merge remote branch 'bistromath/volk_fix' into safe_align
Conflicts:
volk/apps/volk_profile.cc
Diffstat (limited to 'gr-vocoder/grc/vocoder_block_tree.xml')
| -rw-r--r-- | gr-vocoder/grc/vocoder_block_tree.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gr-vocoder/grc/vocoder_block_tree.xml b/gr-vocoder/grc/vocoder_block_tree.xml index 0c0fdd4a0..1766b4e26 100644 --- a/gr-vocoder/grc/vocoder_block_tree.xml +++ b/gr-vocoder/grc/vocoder_block_tree.xml @@ -30,7 +30,6 @@ <name></name> <!-- Blank for Root Name --> <cat> <name>Vocoders</name> - <block>vocoder_binary_slicer_fb</block> <block>vocoder_alaw_decode_bs</block> <block>vocoder_alaw_encode_sb</block> <block>vocoder_codec2_decode_ps</block> |