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-trellis/include/trellis/permutation.h | |
| parent | 2930f1b4265b794599d814e9a3d68fd03bde010f (diff) | |
docs: fixes for merge conflicts and differences between master/next.
Diffstat (limited to 'gr-trellis/include/trellis/permutation.h')
| -rw-r--r-- | gr-trellis/include/trellis/permutation.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-trellis/include/trellis/permutation.h b/gr-trellis/include/trellis/permutation.h index adfe44a576..0f974abb97 100644 --- a/gr-trellis/include/trellis/permutation.h +++ b/gr-trellis/include/trellis/permutation.h @@ -32,7 +32,7 @@ namespace gr { /*! * \brief Permutation. - * \ingroup coding_blk + * \ingroup trellis_coding_blk */ class TRELLIS_API permutation : virtual public gr_sync_block { |