Conflicts: gnuradio-core/src/lib/filter/gr_adaptive_fir_ccc.h gnuradio-core/src/lib/filter/gr_adaptive_fir_ccf.h gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h gnuradio-core/src/lib/filter/gr_fft_filter_ccc.h gnuradio-core/src/lib/filter/gr_fft_filter_fff.h gnuradio-core/src/lib/filter/gr_filter_delay_fc.h gnuradio-core/src/lib/filter/gr_fir_fcc_x86.h gnuradio-core/src/lib/filter/gr_fir_filter_XXX.h.t gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.h gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.h gnuradio-core/src/lib/filter/gr_freq_xlating_fir_filter_XXX.h.t gnuradio-core/src/lib/filter/gr_goertzel_fc.h gnuradio-core/src/lib/filter/gr_hilbert_fc.h gnuradio-core/src/lib/filter/gr_iir_filter_ffd.h gnuradio-core/src/lib/filter/gr_interp_fir_filter_XXX.h.t gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.h gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_fff.h gnuradio-core/src/lib/filter/gr_pfb_channelizer_ccf.h gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h gnuradio-core/src/lib/filter/gr_pfb_clock_sync_fff.h gnuradio-core/src/lib/filter/gr_pfb_decimator_ccf.h gnuradio-core/src/lib/filter/gr_pfb_interpolator_ccf.h gnuradio-core/src/lib/filter/gr_pfb_synthesizer_ccf.h gnuradio-core/src/lib/filter/gr_rational_resampler_base_XXX.h.t gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_cc.h gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_ff.h gnuradio-core/src/lib/filter/gri_fft_filter_ccc_generic.h gnuradio-core/src/lib/filter/gri_fft_filter_ccc_sse.h gnuradio-core/src/lib/general/gr_add_ff.h gnuradio-core/src/lib/general/gr_additive_scrambler_bb.h gnuradio-core/src/lib/general/gr_agc2_cc.h gnuradio-core/src/lib/general/gr_agc2_ff.h gnuradio-core/src/lib/general/gr_agc_cc.h gnuradio-core/src/lib/general/gr_agc_ff.h gnuradio-core/src/lib/general/gr_align_on_samplenumbers_ss.h gnuradio-core/src/lib/general/gr_bin_statistics_f.h gnuradio-core/src/lib/general/gr_burst_tagger.h gnuradio-core/src/lib/general/gr_bytes_to_syms.h gnuradio-core/src/lib/general/gr_char_to_float.h gnuradio-core/src/lib/general/gr_char_to_short.h gnuradio-core/src/lib/general/gr_check_counting_s.h gnuradio-core/src/lib/general/gr_check_lfsr_32k_s.h gnuradio-core/src/lib/general/gr_complex_to_interleaved_short.h gnuradio-core/src/lib/general/gr_complex_to_xxx.h gnuradio-core/src/lib/general/gr_conjugate_cc.h gnuradio-core/src/lib/general/gr_copy.h gnuradio-core/src/lib/general/gr_correlate_access_code_tag_bb.h gnuradio-core/src/lib/general/gr_cpfsk_bc.h gnuradio-core/src/lib/general/gr_ctcss_squelch_ff.h gnuradio-core/src/lib/general/gr_decode_ccsds_27_fb.h gnuradio-core/src/lib/general/gr_deinterleave.h gnuradio-core/src/lib/general/gr_delay.h gnuradio-core/src/lib/general/gr_descrambler_bb.h gnuradio-core/src/lib/general/gr_diff_decoder_bb.h gnuradio-core/src/lib/general/gr_diff_encoder_bb.h gnuradio-core/src/lib/general/gr_diff_phasor_cc.h gnuradio-core/src/lib/general/gr_dpll_bb.h gnuradio-core/src/lib/general/gr_encode_ccsds_27_bb.h gnuradio-core/src/lib/general/gr_fake_channel_coder_pp.h gnuradio-core/src/lib/general/gr_feedforward_agc_cc.h gnuradio-core/src/lib/general/gr_fft_vcc.h gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h gnuradio-core/src/lib/general/gr_fft_vfc.h gnuradio-core/src/lib/general/gr_float_to_char.h gnuradio-core/src/lib/general/gr_float_to_complex.h gnuradio-core/src/lib/general/gr_float_to_int.h gnuradio-core/src/lib/general/gr_float_to_short.h gnuradio-core/src/lib/general/gr_float_to_uchar.h gnuradio-core/src/lib/general/gr_framer_sink_1.h gnuradio-core/src/lib/general/gr_frequency_modulator_fc.h gnuradio-core/src/lib/general/gr_glfsr_source_b.h gnuradio-core/src/lib/general/gr_glfsr_source_f.h gnuradio-core/src/lib/general/gr_head.h gnuradio-core/src/lib/general/gr_int_to_float.h gnuradio-core/src/lib/general/gr_interleave.h gnuradio-core/src/lib/general/gr_interleaved_short_to_complex.h gnuradio-core/src/lib/general/gr_iqcomp_cc.h gnuradio-core/src/lib/general/gr_keep_m_in_n.h gnuradio-core/src/lib/general/gr_keep_one_in_n.h gnuradio-core/src/lib/general/gr_kludge_copy.h gnuradio-core/src/lib/general/gr_lfsr_32k_source_s.h gnuradio-core/src/lib/general/gr_map_bb.h gnuradio-core/src/lib/general/gr_message_strobe.h gnuradio-core/src/lib/general/gr_multiply_cc.h gnuradio-core/src/lib/general/gr_multiply_conjugate_cc.h gnuradio-core/src/lib/general/gr_multiply_const_cc.h gnuradio-core/src/lib/general/gr_multiply_const_ff.h gnuradio-core/src/lib/general/gr_multiply_ff.h gnuradio-core/src/lib/general/gr_nlog10_ff.h gnuradio-core/src/lib/general/gr_nop.h gnuradio-core/src/lib/general/gr_null_sink.h gnuradio-core/src/lib/general/gr_null_source.h gnuradio-core/src/lib/general/gr_ofdm_frame_sink2.h gnuradio-core/src/lib/general/gr_pack_k_bits_bb.h gnuradio-core/src/lib/general/gr_packet_sink.h gnuradio-core/src/lib/general/gr_peak_detector2_fb.h gnuradio-core/src/lib/general/gr_phase_modulator_fc.h gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.h gnuradio-core/src/lib/general/gr_pll_freqdet_cf.h gnuradio-core/src/lib/general/gr_pll_refout_cc.h gnuradio-core/src/lib/general/gr_pn_correlator_cc.h gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_c.h gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_cf.h gnuradio-core/src/lib/general/gr_probe_avg_mag_sqrd_f.h gnuradio-core/src/lib/general/gr_pwr_squelch_cc.h gnuradio-core/src/lib/general/gr_pwr_squelch_ff.h gnuradio-core/src/lib/general/gr_quadrature_demod_cf.h gnuradio-core/src/lib/general/gr_rail_ff.h gnuradio-core/src/lib/general/gr_random_pdu.h gnuradio-core/src/lib/general/gr_regenerate_bb.h gnuradio-core/src/lib/general/gr_repeat.h gnuradio-core/src/lib/general/gr_rms_cf.h gnuradio-core/src/lib/general/gr_rms_ff.h gnuradio-core/src/lib/general/gr_scrambler_bb.h gnuradio-core/src/lib/general/gr_short_to_char.h gnuradio-core/src/lib/general/gr_short_to_float.h gnuradio-core/src/lib/general/gr_simple_correlator.h gnuradio-core/src/lib/general/gr_simple_framer.h gnuradio-core/src/lib/general/gr_simple_squelch_cc.h gnuradio-core/src/lib/general/gr_skiphead.h gnuradio-core/src/lib/general/gr_stream_mux.h gnuradio-core/src/lib/general/gr_stream_to_streams.h gnuradio-core/src/lib/general/gr_stream_to_vector.h gnuradio-core/src/lib/general/gr_streams_to_stream.h gnuradio-core/src/lib/general/gr_streams_to_vector.h gnuradio-core/src/lib/general/gr_stretch_ff.h gnuradio-core/src/lib/general/gr_tag_debug.h gnuradio-core/src/lib/general/gr_threshold_ff.h gnuradio-core/src/lib/general/gr_throttle.h gnuradio-core/src/lib/general/gr_uchar_to_float.h gnuradio-core/src/lib/general/gr_unpack_k_bits_bb.h gnuradio-core/src/lib/general/gr_vco_f.h gnuradio-core/src/lib/general/gr_vector_map.h gnuradio-core/src/lib/general/gr_vector_to_stream.h gnuradio-core/src/lib/general/gr_vector_to_streams.h gnuradio-core/src/lib/gengen/gr_moving_average_XX.h.t gnuradio-core/src/lib/hier/gr_channel_model.h gr-analog/include/analog/agc2_cc.h gr-analog/include/analog/agc2_ff.h gr-analog/include/analog/cpm.h gr-analog/include/analog/ctcss_squelch_ff.h gr-analog/include/analog/feedforward_agc_cc.h gr-analog/include/analog/lfsr.h gr-analog/include/analog/plateau_detector_fb.h gr-blocks/grc/blocks_block_tree.xml gr-digital/grc/digital_block_tree.xml gr-digital/include/digital_additive_scrambler_bb.h gr-digital/include/digital_binary_slicer_fb.h gr-digital/include/digital_bytes_to_syms.h gr-digital/include/digital_chunks_to_symbols_XX.h.t gr-digital/include/digital_clock_recovery_mm_cc.h gr-digital/include/digital_clock_recovery_mm_ff.h gr-digital/include/digital_cma_equalizer_cc.h gr-digital/include/digital_constellation_decoder_cb.h gr-digital/include/digital_constellation_receiver_cb.h gr-digital/include/digital_correlate_access_code_bb.h gr-digital/include/digital_costas_loop_cc.h gr-digital/include/digital_cpmmod_bc.h gr-digital/include/digital_crc32_bb.h gr-digital/include/digital_descrambler_bb.h gr-digital/include/digital_diff_decoder_bb.h gr-digital/include/digital_diff_encoder_bb.h gr-digital/include/digital_diff_phasor_cc.h gr-digital/include/digital_fll_band_edge_cc.h gr-digital/include/digital_framer_sink_1.h gr-digital/include/digital_glfsr_source_b.h gr-digital/include/digital_glfsr_source_f.h gr-digital/include/digital_gmskmod_bc.h gr-digital/include/digital_kurtotic_equalizer_cc.h gr-digital/include/digital_lms_dd_equalizer_cc.h gr-digital/include/digital_map_bb.h gr-digital/include/digital_mpsk_receiver_cc.h gr-digital/include/digital_mpsk_snr_est_cc.h gr-digital/include/digital_ofdm_chanest_vcvc.h gr-digital/include/digital_ofdm_equalizer_base.h gr-digital/include/digital_ofdm_equalizer_simpledfe.h gr-digital/include/digital_ofdm_equalizer_static.h gr-digital/include/digital_ofdm_frame_acquisition.h gr-digital/include/digital_ofdm_frame_sink.h gr-digital/include/digital_ofdm_insert_preamble.h gr-digital/include/digital_ofdm_mapper_bcv.h gr-digital/include/digital_ofdm_sync_sc_cfb.h gr-digital/include/digital_packet_sink.h gr-digital/include/digital_pfb_clock_sync_ccf.h gr-digital/include/digital_pfb_clock_sync_fff.h gr-digital/include/digital_pn_correlator_cc.h gr-digital/include/digital_probe_density_b.h gr-digital/include/digital_probe_mpsk_snr_est_c.h gr-digital/include/digital_scrambler_bb.h gr-digital/include/digital_simple_correlator.h gr-digital/include/digital_simple_framer.h gr-filter/grc/filter_block_tree.xml gr-filter/include/filter/channel_model.h gr-filter/include/filter/iir_filter_ffd.h gr-noaa/lib/noaa_hrpt_decoder.h gr-noaa/lib/noaa_hrpt_deframer.h gr-noaa/lib/noaa_hrpt_pll_cf.h gr-pager/lib/pager_flex_deinterleave.h gr-pager/lib/pager_flex_frame.h gr-pager/lib/pager_flex_sync.h gr-qtgui/grc/qtgui_check_box.xml gr-qtgui/grc/qtgui_chooser.xml gr-qtgui/grc/qtgui_entry.xml gr-qtgui/grc/qtgui_label.xml gr-qtgui/grc/qtgui_range.xml gr-qtgui/grc/qtgui_sink_x.xml gr-qtgui/grc/qtgui_tab_widget.xml gr-qtgui/grc/qtgui_time_sink_x.xml gr-qtgui/include/qtgui_sink_c.h gr-qtgui/include/qtgui_sink_f.h gr-qtgui/include/qtgui_time_sink_c.h gr-qtgui/include/qtgui_time_sink_f.h gr-trellis/src/lib/fsm.h gr-trellis/src/lib/interleaver.h gr-trellis/src/lib/trellis_constellation_metrics_cf.h gr-trellis/src/lib/trellis_encoder_XX.h.t gr-trellis/src/lib/trellis_metrics_X.h.t gr-trellis/src/lib/trellis_pccc_decoder_X.h.t gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.h.t gr-trellis/src/lib/trellis_pccc_encoder_XX.h.t gr-trellis/src/lib/trellis_permutation.h gr-trellis/src/lib/trellis_sccc_decoder_X.h.t gr-trellis/src/lib/trellis_sccc_decoder_combined_XX.h.t gr-trellis/src/lib/trellis_sccc_encoder_XX.h.t gr-trellis/src/lib/trellis_siso_combined_f.h gr-trellis/src/lib/trellis_siso_f.h gr-trellis/src/lib/trellis_viterbi_X.h.t gr-trellis/src/lib/trellis_viterbi_combined_XX.h.t gr-vocoder/include/vocoder_alaw_decode_bs.h gr-vocoder/include/vocoder_alaw_encode_sb.h gr-vocoder/include/vocoder_codec2_decode_ps.h gr-vocoder/include/vocoder_codec2_encode_sp.h gr-vocoder/include/vocoder_cvsd_decode_bs.h gr-vocoder/include/vocoder_cvsd_encode_sb.h gr-vocoder/include/vocoder_g721_decode_bs.h gr-vocoder/include/vocoder_g721_encode_sb.h gr-vocoder/include/vocoder_g723_24_decode_bs.h gr-vocoder/include/vocoder_g723_24_encode_sb.h gr-vocoder/include/vocoder_g723_40_decode_bs.h gr-vocoder/include/vocoder_g723_40_encode_sb.h gr-vocoder/include/vocoder_gsm_fr_decode_ps.h gr-vocoder/include/vocoder_gsm_fr_encode_sp.h gr-vocoder/include/vocoder_ulaw_decode_bs.h gr-vocoder/include/vocoder_ulaw_encode_sb.h gr-wxgui/grc/wxgui_fftsink2.xml gr-wxgui/grc/wxgui_waterfallsink2.xml grc/blocks/blks2_pfb_arb_resampler.xml grc/blocks/blks2_pfb_channelizer.xml grc/blocks/block_tree.xml grc/blocks/gr_add_const_vxx.xml grc/blocks/gr_add_xx.xml grc/blocks/gr_additive_scrambler_bb.xml grc/blocks/gr_agc2_xx.xml grc/blocks/gr_agc_xx.xml grc/blocks/gr_and_const_xx.xml grc/blocks/gr_and_xx.xml grc/blocks/gr_argmax_xx.xml grc/blocks/gr_burst_tagger.xml grc/blocks/gr_channel_model.xml grc/blocks/gr_char_to_float.xml grc/blocks/gr_char_to_short.xml grc/blocks/gr_chunks_to_symbols.xml grc/blocks/gr_complex_to_arg.xml grc/blocks/gr_complex_to_float.xml grc/blocks/gr_complex_to_imag.xml grc/blocks/gr_complex_to_interleaved_short.xml grc/blocks/gr_complex_to_mag.xml grc/blocks/gr_complex_to_mag_squared.xml grc/blocks/gr_complex_to_real.xml grc/blocks/gr_conjugate_cc.xml grc/blocks/gr_copy.xml grc/blocks/gr_cpfsk_bc.xml grc/blocks/gr_ctcss_squelch_ff.xml grc/blocks/gr_dc_blocker.xml grc/blocks/gr_deinterleave.xml grc/blocks/gr_delay.xml grc/blocks/gr_descrambler_bb.xml grc/blocks/gr_diff_decoder_bb.xml grc/blocks/gr_diff_encoder_bb.xml grc/blocks/gr_diff_phasor_cc.xml grc/blocks/gr_divide_xx.xml grc/blocks/gr_dpll_bb.xml grc/blocks/gr_endian_swap.xml grc/blocks/gr_feedforward_agc_cc.xml grc/blocks/gr_fft_filter_xxx.xml grc/blocks/gr_fft_vxx.xml grc/blocks/gr_file_sink.xml grc/blocks/gr_file_source.xml grc/blocks/gr_filter_delay_fc.xml grc/blocks/gr_fir_filter_xxx.xml grc/blocks/gr_float_to_char.xml grc/blocks/gr_float_to_complex.xml grc/blocks/gr_float_to_int.xml grc/blocks/gr_float_to_short.xml grc/blocks/gr_float_to_uchar.xml grc/blocks/gr_fractional_interpolator_xx.xml grc/blocks/gr_freq_xlating_fir_filter_xxx.xml grc/blocks/gr_frequency_modulator_fc.xml grc/blocks/gr_glfsr_source_x.xml grc/blocks/gr_goertzel_fc.xml grc/blocks/gr_head.xml grc/blocks/gr_hilbert_fc.xml grc/blocks/gr_iir_filter_ffd.xml grc/blocks/gr_int_to_float.xml grc/blocks/gr_integrate_xx.xml grc/blocks/gr_interleave.xml grc/blocks/gr_interleaved_short_to_complex.xml grc/blocks/gr_interp_fir_filter_xxx.xml grc/blocks/gr_keep_m_in_n.xml grc/blocks/gr_keep_one_in_n.xml grc/blocks/gr_kludge_copy.xml grc/blocks/gr_map_bb.xml grc/blocks/gr_max_xx.xml grc/blocks/gr_message_burst_source.xml grc/blocks/gr_message_debug.xml grc/blocks/gr_message_sink.xml grc/blocks/gr_message_source.xml grc/blocks/gr_message_strobe.xml grc/blocks/gr_moving_average_xx.xml grc/blocks/gr_multiply_const_vxx.xml grc/blocks/gr_multiply_xx.xml grc/blocks/gr_mute_xx.xml grc/blocks/gr_nlog10_ff.xml grc/blocks/gr_noise_source_x.xml grc/blocks/gr_nop.xml grc/blocks/gr_not_xx.xml grc/blocks/gr_null_sink.xml grc/blocks/gr_null_source.xml grc/blocks/gr_or_xx.xml grc/blocks/gr_pack_k_bits_bb.xml grc/blocks/gr_packed_to_unpacked_xx.xml grc/blocks/gr_pdu_to_tagged_stream.xml grc/blocks/gr_peak_detector2_fb.xml grc/blocks/gr_peak_detector_xb.xml grc/blocks/gr_pfb_clock_sync.xml grc/blocks/gr_pfb_synthesizer.xml grc/blocks/gr_phase_modulator_fc.xml grc/blocks/gr_pll_carriertracking_cc.xml grc/blocks/gr_pll_freqdet_cf.xml grc/blocks/gr_pll_refout_cc.xml grc/blocks/gr_pn_correlator_cc.xml grc/blocks/gr_probe_avg_mag_sqrd_x.xml grc/blocks/gr_probe_density_b.xml grc/blocks/gr_probe_signal_f.xml grc/blocks/gr_pwr_squelch_xx.xml grc/blocks/gr_quadrature_demod_cf.xml grc/blocks/gr_rational_resampler_base_xxx.xml grc/blocks/gr_repeat.xml grc/blocks/gr_rms_xx.xml grc/blocks/gr_sample_and_hold_xx.xml grc/blocks/gr_scrambler_bb.xml grc/blocks/gr_short_to_char.xml grc/blocks/gr_short_to_float.xml grc/blocks/gr_sig_source_x.xml grc/blocks/gr_simple_correlator.xml grc/blocks/gr_simple_framer.xml grc/blocks/gr_simple_squelch_cc.xml grc/blocks/gr_single_pole_iir_filter_xx.xml grc/blocks/gr_skiphead.xml grc/blocks/gr_socket_pdu.xml grc/blocks/gr_stream_mux.xml grc/blocks/gr_stream_to_streams.xml grc/blocks/gr_stream_to_vector.xml grc/blocks/gr_streams_to_stream.xml grc/blocks/gr_streams_to_vector.xml grc/blocks/gr_sub_xx.xml grc/blocks/gr_tag_debug.xml grc/blocks/gr_tagged_stream_to_pdu.xml grc/blocks/gr_threshold_ff.xml grc/blocks/gr_throttle.xml grc/blocks/gr_transcendental.xml grc/blocks/gr_tuntap_pdu.xml grc/blocks/gr_uchar_to_float.xml grc/blocks/gr_udp_sink.xml grc/blocks/gr_udp_source.xml grc/blocks/gr_unpack_k_bits_bb.xml grc/blocks/gr_unpacked_to_packed_xx.xml grc/blocks/gr_vco_f.xml grc/blocks/gr_vector_insert_x.xml grc/blocks/gr_vector_sink_x.xml grc/blocks/gr_vector_source_x.xml grc/blocks/gr_vector_to_stream.xml grc/blocks/gr_vector_to_streams.xml grc/blocks/gr_wavfile_sink.xml grc/blocks/gr_wavfile_source.xml grc/blocks/gr_xor_xx.xml