diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-01 13:19:00 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-01 13:19:00 -0500 |
| commit | ce211603ff8821b50f7c9ebc3931498c6f2bd374 (patch) | |
| tree | dd8b92841ef4cd0728aa1156b105e7173286627b /docs/doxygen/other/group_defs.dox | |
| parent | 6121d0b12bcb308586b5888b6c7e82832f692e5c (diff) | |
| parent | 4c164f4cbb7fc9284bec147809b078d0a8ed9f88 (diff) | |
Merge branch 'master' into gr_log
Conflicts:
cmake/Modules/GrMiscUtils.cmake
docs/doxygen/other/main_page.dox
gnuradio-core/gnuradio-core.conf.in
gnuradio-core/src/lib/swig/CMakeLists.txt
gr-digital/lib/CMakeLists.txt
gr-howto-write-a-block/CMakeLists.txt
gr-qtgui/lib/CMakeLists.txt
gr-video-sdl/src/CMakeLists.txt
Diffstat (limited to 'docs/doxygen/other/group_defs.dox')
| -rw-r--r-- | docs/doxygen/other/group_defs.dox | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/doxygen/other/group_defs.dox b/docs/doxygen/other/group_defs.dox index 213486b7a1..4aee49ec85 100644 --- a/docs/doxygen/other/group_defs.dox +++ b/docs/doxygen/other/group_defs.dox @@ -28,6 +28,7 @@ /*! \defgroup slicedice_blk Slicing and Dicing Streams */ /*! \defgroup vocoder_blk Voice Encoders and Decoders */ /*! \defgroup digital Digital Modulation Blocks */ +/*! \defgroup analog Analog Communications Blocks */ /*! \defgroup qtgui_blk QT Graphical Interfaces */ /*! \defgroup uhd_blk UHD Interface */ /*! \defgroup audio_blk Audio Interface */ |