summaryrefslogtreecommitdiff
path: root/gr-digital/hier/digital_cpmmod_bc.h
AgeCommit message (Collapse)Author
2011-09-05Merge branch 'digital' of https://github.com/trondeau/gnuradio into digitalJosh Blum
Conflicts: gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.h gnuradio-core/src/lib/general/gr_pll_freqdet_cf.h gr-digital/lib/digital_constellation.h gr-digital/lib/digital_constellation_receiver_cb.h gr-digital/lib/digital_fll_band_edge_cc.h gr-digital/lib/digital_mpsk_receiver_cc.h
2011-09-01digital: adding CPM C++ hier block, which adds a hier directory to ↵Tom Rondeau
gr-digital. Reworked build system to include this in the libraries and modules built.