diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-05-12 09:46:25 +1000 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-05-12 09:46:25 +1000 |
| commit | 792302fbdfa37cf680234353dbe973886c4b2898 (patch) | |
| tree | e999bcf6dbfe12cf19ae49b1762cd71d724aa8ae /gr-blocks/include/gnuradio/blocks/repack_bits_bb.h | |
| parent | a7adf4689b58d91bd88d0dc948b017e1d42bff01 (diff) | |
| parent | 9851f2377d099ffe72312375e7f761f66b664aa6 (diff) | |
Merge branch 'next' into runtime_pimpl
Catches up runtime_pimpl branch with changes on next since
the initial branch start.
Conflicts:
gnuradio-runtime/include/gnuradio/constants.h
gnuradio-runtime/include/gnuradio/tags.h
gnuradio-runtime/include/gr_block_detail.h
gnuradio-runtime/include/gr_buffer.h
gnuradio-runtime/lib/CMakeLists.txt
gnuradio-runtime/lib/gr_block.cc
gnuradio-runtime/lib/gr_block_detail.cc
gnuradio-runtime/lib/gr_block_executor.cc
gnuradio-runtime/lib/gr_buffer.cc
gnuradio-runtime/lib/gr_realtime.cc
gr-blocks/lib/interleaved_short_to_complex_impl.cc
Diffstat (limited to 'gr-blocks/include/gnuradio/blocks/repack_bits_bb.h')
| -rw-r--r-- | gr-blocks/include/gnuradio/blocks/repack_bits_bb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h b/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h index ed051a9744..c594966e6e 100644 --- a/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h +++ b/gr-blocks/include/gnuradio/blocks/repack_bits_bb.h @@ -30,7 +30,7 @@ namespace gr { namespace blocks { /*! - * \brief Pack \p k bits from the input stream onto \p k bits of the output stream. + * \brief Pack \p k bits from the input stream onto \p l bits of the output stream. * \ingroup byte_operators_blk * * \details |