diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-18 09:10:18 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-18 09:22:19 -0700 |
| commit | 113c4ef92819e703d24eb6a409751f2757635528 (patch) | |
| tree | 38e42b254d9d9f4367a07ffc5f1452e43a54f7b7 /docs/sphinx/gnuradio_sphinx.py | |
| parent | f15400470ce5cb68f5339ead7af726b8bbafd364 (diff) | |
| parent | c3d4fbf1809d6b3051a4c532d3d6bb5cadb3b6e3 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/include/digital/CMakeLists.txt
gr-digital/lib/CMakeLists.txt
gr-digital/lib/scale_tags_impl.cc
gr-digital/lib/tagged_stream_check_impl.cc
gr-digital/lib/ts_insert_zeros_cc_impl.cc
gr-digital/python/qa_scale_tags.py
gr-digital/python/qa_ts_insert_zeros.py
gr-digital/swig/digital_swig.i
Diffstat (limited to 'docs/sphinx/gnuradio_sphinx.py')
| -rw-r--r-- | docs/sphinx/gnuradio_sphinx.py | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/docs/sphinx/gnuradio_sphinx.py b/docs/sphinx/gnuradio_sphinx.py index e8ca867f8c..06a3150c49 100644 --- a/docs/sphinx/gnuradio_sphinx.py +++ b/docs/sphinx/gnuradio_sphinx.py @@ -107,7 +107,32 @@ common_block_members =[ 'to_basic_block', 'unique_id', 'make', - ] + 'alias', + 'is_set_max_noutput_items', + 'max_noutput_items', + 'max_output_buffer', + 'message_ports_in', + 'message_ports_out', + 'min_output_buffer', + 'pc_input_buffers_full', + 'pc_input_buffers_full_var', + 'pc_noutput_items', + 'pc_noutput_items_var', + 'pc_nproduced', + 'pc_nproduced_var', + 'pc_output_buffers_full', + 'pc_output_buffers_full_var', + 'pc_work_time', + 'pc_work_time_var', + 'processor_affinity', + 'set_block_alias', + 'set_max_noutput_items', + 'unset_max_noutput_items', + 'set_max_output_buffer', + 'set_min_output_buffer', + 'set_processor_affinity', + 'symbol_name', + 'unset_processor_affinity', ] class OldBlockDocumenter(FunctionDocumenter): """ |