diff options
author | Tom Rondeau <trondeau@vt.edu> | 2013-02-28 14:38:40 -0500 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-28 14:38:40 -0500 |
commit | 9f29e51f2945f355b43f3012da43e37dcd95f6b4 (patch) | |
tree | bcc71c8975379c107bb6e94da944292a5ee9a03a /docs/sphinx/source/gr/misc_blk.rst | |
parent | 7afefc484137bf0bed7ab9a7ed86017c117d6a35 (diff) | |
parent | 2f55d7dfc33e8d990e44c5bbb7c6d2fbdaddd563 (diff) |
Merge branch 'next' into perf_monitor
Diffstat (limited to 'docs/sphinx/source/gr/misc_blk.rst')
-rw-r--r-- | docs/sphinx/source/gr/misc_blk.rst | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/docs/sphinx/source/gr/misc_blk.rst b/docs/sphinx/source/gr/misc_blk.rst index 4c1a0ee551..a4dcc58a2d 100644 --- a/docs/sphinx/source/gr/misc_blk.rst +++ b/docs/sphinx/source/gr/misc_blk.rst @@ -5,6 +5,4 @@ gnuradio.gr: Miscellaneous Blocks .. autooldblock:: gnuradio.gr.kludge_copy .. autooldblock:: gnuradio.gr.nop .. autooldblock:: gnuradio.gr.pa_2x2_phase_combiner -.. autooldblock:: gnuradio.gr.threshold_ff -.. autooldblock:: gnuradio.gr.throttle .. autooldblock:: gnuradio.gr.channel_model |