diff options
| author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-02-14 12:32:52 -0800 |
|---|---|---|
| committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-02-14 12:34:47 -0800 |
| commit | f0a1631dad755d5abf28351f07b2bbf7773b37b8 (patch) | |
| tree | 397b02568ddbab1f85646afdd06aee6fd540c99c /docs/doxygen/other | |
| parent | ef1748e4efc40cc065fb5f1b40d710256dd37efa (diff) | |
| parent | dc266ca38bdc59955f8c8d8a98291f078d7f4377 (diff) | |
Merge branch 'master' into safe_align
Conflicts:
gnuradio-core/src/lib/filter/gr_fft_filter_ccc.cc
gnuradio-core/src/lib/filter/gr_fft_filter_fff.cc
Diffstat (limited to 'docs/doxygen/other')
| -rw-r--r-- | docs/doxygen/other/group_defs.dox | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/docs/doxygen/other/group_defs.dox b/docs/doxygen/other/group_defs.dox index facdc23388..285fbd1a5c 100644 --- a/docs/doxygen/other/group_defs.dox +++ b/docs/doxygen/other/group_defs.dox @@ -58,18 +58,10 @@ */ /*! - * \defgroup radar Radar - * Radar Applications... - */ - -/*! * \defgroup pager Pager * Pager Applications */ /*! @} */ -/*! \defgroup usrp USRP */ -/*! \defgroup usrp2 USRP2 */ - /*! \defgroup hardware Misc Hardware Control */ |