diff options
author | Tom Rondeau <trondeau@vt.edu> | 2013-04-04 11:50:35 -0400 |
---|---|---|
committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-04 12:37:40 -0400 |
commit | 8b1303bbb0bf72569a5149082796f50b6e8f9a5b (patch) | |
tree | 5809962a19338db21f28957535529552d12992a1 /gr-vocoder/include/vocoder/codec2_encode_sp.h | |
parent | 2930f1b4265b794599d814e9a3d68fd03bde010f (diff) |
docs: fixes for merge conflicts and differences between master/next.
Diffstat (limited to 'gr-vocoder/include/vocoder/codec2_encode_sp.h')
-rw-r--r-- | gr-vocoder/include/vocoder/codec2_encode_sp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-vocoder/include/vocoder/codec2_encode_sp.h b/gr-vocoder/include/vocoder/codec2_encode_sp.h index 59ed100837..2960bee04b 100644 --- a/gr-vocoder/include/vocoder/codec2_encode_sp.h +++ b/gr-vocoder/include/vocoder/codec2_encode_sp.h @@ -31,7 +31,7 @@ namespace gr { /*! * \brief CODEC2 Vocoder Encoder - * \ingroup vocoder_blk + * \ingroup audio_blk */ class VOCODER_API codec2_encode_sp : virtual public gr_sync_decimator { |