diff options
| author | Josh Blum <josh@joshknows.com> | 2011-10-11 21:35:35 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-10-11 21:35:35 -0700 |
| commit | 1259a01a9479071bd1729a9c9496444f0a72509b (patch) | |
| tree | 55350454454a119fb230cdbaadfb27d361f191ec /gr-digital/include/digital_mpsk_receiver_cc.h | |
| parent | 71c0f14a46f85027b95f2f5f6d3d219cc9e3783e (diff) | |
| parent | 06860c309153890a6a42babfbedf230eb24f0042 (diff) | |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Conflicts:
gr-digital/include/digital_constellation.h
Diffstat (limited to 'gr-digital/include/digital_mpsk_receiver_cc.h')
| -rw-r--r-- | gr-digital/include/digital_mpsk_receiver_cc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gr-digital/include/digital_mpsk_receiver_cc.h b/gr-digital/include/digital_mpsk_receiver_cc.h index 85cd81e992..e70495bfad 100644 --- a/gr-digital/include/digital_mpsk_receiver_cc.h +++ b/gr-digital/include/digital_mpsk_receiver_cc.h @@ -48,6 +48,7 @@ digital_make_mpsk_receiver_cc (unsigned int M, float theta, * through phase, frequency, and symbol synchronization. * \ingroup sync_blk * \ingroup demod_blk + * \ingroup digital * * This block takes care of receiving M-PSK modulated signals through * phase, frequency, and symbol synchronization. It performs carrier |