diff options
author | Tom Rondeau <trondeau@vt.edu> | 2011-12-30 13:49:14 -0500 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2011-12-30 13:49:14 -0500 |
commit | dd84c8dfcb30617dbac56f49a57c1e363afe643b (patch) | |
tree | e6e4e71634dc4dc3f5e85ab5ff2c92e7ada8fa78 /docs | |
parent | 0cdc6e67f575f6c86ad12734f87cf83aed72b102 (diff) | |
parent | 9838bb040af5eb21cd88dbc9aae8d4bdf2838854 (diff) |
Merge branch 'master' into next
Conflicts:
gr-digital/examples/Makefile.am
gr-digital/include/Makefile.am
gr-digital/lib/Makefile.am
gr-digital/python/Makefile.am
gr-digital/swig/Makefile.am
Diffstat (limited to 'docs')
-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 6288d1f0a2..facdc23388 100644 --- a/docs/doxygen/other/group_defs.dox +++ b/docs/doxygen/other/group_defs.dox @@ -32,6 +32,7 @@ /*! \defgroup uhd_blk UHD Interface */ /*! \defgroup audio_blk Audio Interface */ /*! \defgroup pfb_blk Polyphase Filterbank */ +/*! \defgroup snr_blk SNR estimators */ /*! * \defgroup base_blk Base classes for GR Blocks |