diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-01 14:44:07 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-01 14:44:07 -0700 |
| commit | edbcd297b252c3ee9fc5544cbe12115f45c727a7 (patch) | |
| tree | 1a03284df8b93a85d89cdb81a4631f66a2379cdb /docs/sphinx | |
| parent | 85012bb73b8ad452262d5bd6e4af08fcb137144a (diff) | |
| parent | 457186838d12607bcf9f5e61eaf937ff5fa090e0 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'docs/sphinx')
| -rw-r--r-- | docs/sphinx/source/blocks_blocks.rst | 1 | ||||
| -rw-r--r-- | docs/sphinx/source/index.rst | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docs/sphinx/source/blocks_blocks.rst b/docs/sphinx/source/blocks_blocks.rst index 056e9efe9a..f214e01c47 100644 --- a/docs/sphinx/source/blocks_blocks.rst +++ b/docs/sphinx/source/blocks_blocks.rst @@ -185,6 +185,7 @@ gnuradio.blocks .. autoblock:: gnuradio.blocks.tagged_stream_mux .. autoblock:: gnuradio.blocks.tagged_stream_to_pdu .. autoblock:: gnuradio.blocks.tags_strobe +.. autoblock:: gnuradio.blocks.tcp_server_sink .. autoblock:: gnuradio.blocks.threshold_ff .. autoblock:: gnuradio.blocks.throttle .. autoblock:: gnuradio.blocks.transcendental diff --git a/docs/sphinx/source/index.rst b/docs/sphinx/source/index.rst index 7bba2f8e32..5c14d22cce 100644 --- a/docs/sphinx/source/index.rst +++ b/docs/sphinx/source/index.rst @@ -854,6 +854,7 @@ Networking Tools Blocks :nosignatures: gnuradio.blocks.socket_pdu + gnuradio.blocks.tcp_server_sink gnuradio.blocks.udp_sink gnuradio.blocks.udp_source |