Merge branch 'master' into next
Conflicts: gr-digital/grc/Makefile.am
digital: added GRC files for new MPSK SNR estimator and probe.
Merge remote-tracking branch 'benreynwar/maint' into maint
Fixed bug in digital_qam_demod.xml
digital: forgot to include new xml in Makefile.am.
Added digital_constellation_receiver_cb.xml file
Conflicts: gr-digital/examples/Makefile.am gr-digital/include/Makefile.am gr-digital/lib/Makefile.am gr-digital/python/Makefile.am gr-digital/swig/Makefile.am
digital: exposed setting FLL loop bandwidth factor in GRC; must have been overlooked initially.
View revisions
Also available in: Atom