diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
| commit | eea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch) | |
| tree | af3aa889c94cff9c503edefeaf19cb3635693bfb /docs/sphinx/source/uhd.rst | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'docs/sphinx/source/uhd.rst')
| -rw-r--r-- | docs/sphinx/source/uhd.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/sphinx/source/uhd.rst b/docs/sphinx/source/uhd.rst index d9ecf3a519..1f381e23b9 100644 --- a/docs/sphinx/source/uhd.rst +++ b/docs/sphinx/source/uhd.rst @@ -3,9 +3,9 @@ gnuradio.uhd .. automodule:: gnuradio.uhd -.. autooldblock:: gnuradio.uhd.usrp_sink -.. autooldblock:: gnuradio.uhd.usrp_source -.. autooldblock:: gnuradio.uhd.amsg_source +.. autoblock:: gnuradio.uhd.usrp_sink +.. autoblock:: gnuradio.uhd.usrp_source +.. autoblock:: gnuradio.uhd.amsg_source .. autoclass:: gnuradio.uhd.stream_cmd_t .. autoclass:: gnuradio.uhd.time_spec_t .. autoclass:: gnuradio.uhd.meta_range_t |