diff options
| author | Tom Rondeau | 2012-06-07 16:43:28 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2012-06-07 16:43:28 -0400 |
| commit | bfd0dfe00f107e00c0517790247fe723136a4c87 (patch) | |
| tree | d0d97cf850dd5d157f74b2088e07728c55366b23 /grc/blocks/block_tree.xml | |
| parent | 4f9556dc48da8d408994cb3aa84c7dfd716b34dc (diff) | |
| parent | 9dc190127f3cc6f4688feaac514a0b887c531740 (diff) | |
| download | gnuradio-bfd0dfe00f107e00c0517790247fe723136a4c87.tar.gz gnuradio-bfd0dfe00f107e00c0517790247fe723136a4c87.tar.bz2 gnuradio-bfd0dfe00f107e00c0517790247fe723136a4c87.zip | |
Merge branch 'master-mods'
Diffstat (limited to 'grc/blocks/block_tree.xml')
| -rw-r--r-- | grc/blocks/block_tree.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index 18bc050ba..0b0b6854e 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -61,6 +61,7 @@ <block>gr_fft_vxx</block> <block>blks2_logpwrfft_x</block> + <block>gr_vector_insert_x</block> </cat> <cat> <name>Type Conversions</name> @@ -114,6 +115,7 @@ <block>gr_unpacked_to_packed_xx</block> <block>gr_packed_to_unpacked_xx</block> <block>gr_unpack_k_bits_bb</block> + <block>gr_pack_k_bits_bb</block> <block>gr_chunks_to_symbols_xx</block> <block>gr_map_bb</block> </cat> @@ -183,6 +185,7 @@ <block>blks2_rational_resampler_xxx</block> <block>gr_fractional_interpolator_xx</block> <block>gr_keep_one_in_n</block> + <block>gr_keep_m_in_n</block> <block>gr_moving_average_xx</block> <block>gr_iqcomp_cc</block> <block>gr_dc_blocker</block> |