History | View | Annotate | Download (2.9 kB)
Merge branch 'digital' of https://github.com/trondeau/gnuradio into digital
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...
fixed: FM sensitivity and calling gr_cpm::phase_response() through SWIG
updated doxygen blocks, changed param order for gmsk
CPM make checks
