Merge branch 'sync' of git@gnuradio.org:trondeau into master

[debian/gnuradio] / grc / blocks / block_tree.xml

diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 509956d3bc1a322ad3160f8b245b11045bfaf6a8..187ca196a1ea2d27507eaed2ed64eaacc85800fc 100644 (file)
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -109,8 +109,10 @@
 
                <block>gr_stream_to_vector</block>
                <block>gr_vector_to_stream</block>
-               
+
                <block>blks2_stream_to_vector_decimator</block>
+
+               <block>gr_stream_mux</block>
        </cat>
        <cat>
                <name>Misc Conversions</name>
@@ -301,6 +303,7 @@
                <block>gr_skiphead</block>
 
                <block>gr_kludge_copy</block>
+               <block>gr_copy</block>
                <block>gr_nop</block>
 
                <block>xmlrpc_server</block>