summaryrefslogtreecommitdiff
path: root/grc/blocks/block_tree.xml
diff options
context:
space:
mode:
authorAndrej Rode <mail@andrejro.de>2018-06-23 23:41:42 +0200
committerAndrej Rode <mail@andrejro.de>2018-06-24 00:03:35 +0200
commit167a6152bad060fc53dd29e0fa79ef83eff1be5b (patch)
treea01049672d9d7d1bf3d295ed96698a323941f8e8 /grc/blocks/block_tree.xml
parent3c8e6008b092287246234001db7cf1a4038300da (diff)
parentfcd002b6ac82e1e0c1224e24506410ff0833e1aa (diff)
Merge branch 'python3_fix' into next
Manual merge conflict resolution has been applied to following conflicts: * Typos: * gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py * gr-blocks/python/blocks/qa_wavfile.py * gr-filter/examples/gr_filtdes_api.py * grc/blocks/parameter.xml * gr-uhd/python/uhd/__init__.py * ValueError -> RuntimeError: * gr-blocks/python/blocks/qa_hier_block2.py * relative Imports & other Py3k: * gr-digital/python/digital/psk_constellations.py * gr-digital/python/digital/qam_constellations.py * gr-digital/python/digital/test_soft_decisions.py * gr-digital/python/digital/gfsk.py * SequenceCompleter: * gr-utils/python/modtool/modtool_add.py * gr-utils/python/modtool/modtool_rename.py * gr-utils/python/modtool/modtool_rm.py * Updated API on next: * gr-blocks/grc/blocks_file_source.xml * gr-blocks/python/blocks/qa_file_source_sink.py * gr-qtgui/grc/qtgui_time_sink_x.xml * GRC Py3k Updates: * grc/core/Block.py * grc/core/Constants.py * grc/core/Platform.py * grc/core/utils/odict.py * grc/gui/Actions.py * grc/gui/Block.py * grc/gui/Executor.py * grc/gui/Port.py
Diffstat (limited to 'grc/blocks/block_tree.xml')
-rw-r--r--grc/blocks/block_tree.xml30
1 files changed, 0 insertions, 30 deletions
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
deleted file mode 100644
index 3125864d4d..0000000000
--- a/grc/blocks/block_tree.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<cat>
- <name>[Core]</name>
- <cat>
- <name>Misc</name>
- <block>pad_source</block>
- <block>pad_sink</block>
- <block>virtual_source</block>
- <block>virtual_sink</block>
-
- <block>bus_sink</block>
- <block>bus_source</block>
- <block>bus_structure_sink</block>
- <block>bus_structure_source</block>
-
- <block>epy_block</block>
- <block>epy_module</block>
-
- <block>note</block>
- <block>import</block>
- </cat>
- <cat>
- <name>Variables</name>
- <block>variable</block>
- <block>variable_struct</block>
- <block>variable_config</block>
- <block>variable_function_probe</block>
- <block>parameter</block>
- </cat>
-</cat>