From 8b1303bbb0bf72569a5149082796f50b6e8f9a5b Mon Sep 17 00:00:00 2001 From: Tom Rondeau <trondeau@vt.edu> Date: Thu, 4 Apr 2013 11:50:35 -0400 Subject: docs: fixes for merge conflicts and differences between master/next. --- gr-vocoder/include/vocoder/codec2_encode_sp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-vocoder/include/vocoder/codec2_encode_sp.h') 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 { -- cgit v1.2.3