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/video_sdl.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/video_sdl.rst')
| -rw-r--r-- | docs/sphinx/source/video_sdl.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/sphinx/source/video_sdl.rst b/docs/sphinx/source/video_sdl.rst index 6be88d788c..e4fc5acac3 100644 --- a/docs/sphinx/source/video_sdl.rst +++ b/docs/sphinx/source/video_sdl.rst @@ -3,5 +3,5 @@ gnuradio.video_sdl .. automodule:: gnuradio.video_sdl -.. autooldblock:: gnuradio.video_sdl.sink_s -.. autooldblock:: gnuradio.video_sdl.sink_uc +.. autoblock:: gnuradio.video_sdl.sink_s +.. autoblock:: gnuradio.video_sdl.sink_uc |