cmake: better setup for finding QWT; otherwise, it can be forced to incorrectly "find" non-existent QWT libs.
pmt: adding pmt::dict_update(dict1, dict2) function for merging dictionaries
runtime: ieieieieieieieieieieieieieieieieieieieieieeieiieieieiieieieieieieieieieiieiieieiie
Merge branch 'master' of git.gnuradio.org:gnuradio
cmake: fixing up FindICE to handle more possible install cases.

Dropping use of package-config files from Ice. They don't exist when installing by hand and seem incorrect on some Linux installations.
gr-filter: Add a convenience freq_xlating_fft_filter block

It's meant as a GRC convenience mainly. It's in python only and implemented
as a hier block encapsulating a FFT filter + rotator

Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
blocks: add vector output option param to complex_to_interleaved_short to match interleaved_short_to_complex
grc: allow function probe with empty Block ID
Merge remote-tracking branch 'osh/typo_fix'
gr-digital: update the HDLC blocks.

* HDLC deframer is now OVER 9000%! faster
* No more correlate_access_code_tag req'd
* Properly assign HDLC blocks to Packet Operators subgroup
Merge branch 'hdlc_update'
Merge remote-tracking branch 'smunaut/fft-filter'
Merge remote-tracking branch 'osh/cpx_to_ishort_vector'
Merge branch 'maint'
Merge remote-tracking branch 'tom/cmake_ice_libs'
digital: Add MSK/CPM blocks.
digital: Added SWIG bindings for MSK blocks. Fixed (G)MSK correlator.
digital: Really fix MSK correlator, and make it work for non-integer SPS.
digital: Fix warnings.
digital: Remove debug output from MSK correlator