commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.


From: git version control
Subject: [Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.6.4.1-1083-g8358580
Date: Thu, 4 Apr 2013 21:14:18 +0000 (UTC)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "git://gnuradio.org/gnuradio".

The branch, next has been updated
       via  8358580fb5d1cf1d818b5aa18fa2aafa570d0474 (commit)
       via  6c9dbd41941cd65169707cdacc93b9df3993f00a (commit)
       via  23092f793efb108448289a7539ae5fee3299a5ef (commit)
       via  0ebd1c9a5cb64d63991c71d6d1557fdabebe4bff (commit)
       via  dc90b42e8fd232ea9896130c9e7c4a5ee20768c3 (commit)
       via  b8ffea4e1b8c104712368b455632aeedd5c32806 (commit)
       via  d0e0da9a1c97b04cc560439bb486d60ed157ce95 (commit)
       via  6b35d0dbf735efe42e4f9de0c51658091f58208f (commit)
       via  f133e151935aae0f42978b12ae83722a4de88893 (commit)
       via  8b1303bbb0bf72569a5149082796f50b6e8f9a5b (commit)
       via  2930f1b4265b794599d814e9a3d68fd03bde010f (commit)
       via  b7175d5dcfa22c4fd1eef7a40889293cb483ec97 (commit)
       via  ed944b382a215d3020abe7ab9aafcbcbd16e8400 (commit)
       via  d44322fd03661c1eb6e45e3e364e81bb5131239b (commit)
       via  9ce3e6b3f658b9273f048e1a3580be65dc08bef1 (commit)
      from  e6b8806be73f8da5a5cbfb690d01b47de03eab74 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8358580fb5d1cf1d818b5aa18fa2aafa570d0474
Merge: 0ebd1c9 6c9dbd4
Author: Tom Rondeau <address@hidden>
Date:   Thu Apr 4 16:27:29 2013 -0400

    Merge branch 'master' into next
    
    Conflicts:
        docs/doxygen/CMakeLists.txt
        gnuradio-runtime/include/gr_logger.h
        gnuradio-runtime/lib/gr_logger.cc
        gr-trellis/src/lib/CMakeLists.txt

commit 0ebd1c9a5cb64d63991c71d6d1557fdabebe4bff
Author: Tom Rondeau <address@hidden>
Date:   Thu Apr 4 15:42:53 2013 -0400

    docs: fixed depends for generated includes for changed component structure.

commit dc90b42e8fd232ea9896130c9e7c4a5ee20768c3
Merge: d0e0da9 b8ffea4
Author: Tom Rondeau <address@hidden>
Date:   Thu Apr 4 15:37:23 2013 -0400

    Merge branch 'master' into next

commit d0e0da9a1c97b04cc560439bb486d60ed157ce95
Merge: f133e15 6b35d0d
Author: Tom Rondeau <address@hidden>
Date:   Thu Apr 4 14:16:23 2013 -0400

    Merge branch 'master' into next

commit f133e151935aae0f42978b12ae83722a4de88893
Author: Tom Rondeau <address@hidden>
Date:   Thu Apr 4 13:56:45 2013 -0400

    grc: fixing up new next structure blocks for GRC categories.
    
    docs: also updating Doxygen category for all new/moved blocks.

commit 8b1303bbb0bf72569a5149082796f50b6e8f9a5b
Author: Tom Rondeau <address@hidden>
Date:   Thu Apr 4 11:50:35 2013 -0400

    docs: fixes for merge conflicts and differences between master/next.

commit 2930f1b4265b794599d814e9a3d68fd03bde010f
Merge: b7175d5 d44322f
Author: Tom Rondeau <address@hidden>
Date:   Thu Apr 4 11:50:26 2013 -0400

    Merge branch 'master_grc_components' into next_grc_components
    
    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

commit b7175d5dcfa22c4fd1eef7a40889293cb483ec97
Merge: e6b8806 ed944b3
Author: Tom Rondeau <address@hidden>
Date:   Thu Apr 4 10:44:19 2013 -0400

    Merge branch 'master' into next

-----------------------------------------------------------------------

Summary of changes:
 docs/doxygen/CMakeLists.txt                        |    4 +
 docs/doxygen/Doxyfile.in                           |    2 -
 docs/doxygen/other/group_defs.dox                  |   67 ++++---
 docs/doxygen/other/pfb_intro.dox                   |    3 +-
 gnuradio-runtime/lib/gr_logger.cc                  |    4 +-
 gr-analog/doc/analog.dox                           |    2 +-
 gr-analog/grc/analog_block_tree.xml                |   12 +-
 .../grc/analog_random_source_x.xml                 |    4 +-
 gr-analog/include/analog/agc.h                     |    2 +
 gr-analog/include/analog/agc2.h                    |    2 +
 gr-analog/include/analog/agc2_cc.h                 |    3 +-
 gr-analog/include/analog/agc2_ff.h                 |    3 +-
 gr-analog/include/analog/agc_cc.h                  |    3 +-
 gr-analog/include/analog/agc_ff.h                  |    3 +-
 gr-analog/include/analog/cpfsk_bc.h                |    2 +-
 gr-analog/include/analog/cpm.h                     |    5 +-
 gr-analog/include/analog/ctcss_squelch_ff.h        |    2 +-
 gr-analog/include/analog/dpll_bb.h                 |    3 +-
 gr-analog/include/analog/feedforward_agc_cc.h      |    2 +-
 gr-analog/include/analog/fmdet_cf.h                |    1 +
 gr-analog/include/analog/frequency_modulator_fc.h  |    3 +-
 gr-analog/include/analog/noise_source_X.h.t        |    6 +-
 gr-analog/include/analog/phase_modulator_fc.h      |    3 +-
 gr-analog/include/analog/pll_carriertracking_cc.h  |    3 +-
 gr-analog/include/analog/pll_freqdet_cf.h          |    3 +-
 gr-analog/include/analog/pll_refout_cc.h           |    3 +-
 gr-analog/include/analog/probe_avg_mag_sqrd_c.h    |    3 +-
 gr-analog/include/analog/probe_avg_mag_sqrd_cf.h   |    3 +-
 gr-analog/include/analog/probe_avg_mag_sqrd_f.h    |    3 +-
 gr-analog/include/analog/pwr_squelch_cc.h          |    2 +-
 gr-analog/include/analog/pwr_squelch_ff.h          |    2 +-
 gr-analog/include/analog/quadrature_demod_cf.h     |    3 +-
 gr-analog/include/analog/rail_ff.h                 |    2 +-
 gr-analog/include/analog/sig_source_X.h.t          |    4 +-
 gr-analog/include/analog/sig_source_waveform.h     |    4 +
 gr-analog/include/analog/simple_squelch_cc.h       |    2 +-
 gr-audio/grc/audio_sink.xml                        |    2 +-
 gr-audio/grc/audio_source.xml                      |    2 +-
 gr-blocks/doc/blocks.dox                           |    2 +-
 gr-blocks/grc/blocks_block_tree.xml                |  216 ++++++++++++--------
 gr-blocks/grc/blocks_ctrlport_performance.xml      |    1 -
 gr-blocks/grc/blocks_ctrlport_probe2_c.xml         |    1 -
 gr-blocks/grc/blocks_ctrlport_probe_c.xml          |    1 -
 gr-blocks/grc/blocks_ctrlport_viewer.xml           |    1 -
 gr-blocks/grc/blocks_probe_signal_vx.xml           |    2 +-
 gr-blocks/grc/blocks_tagged_stream_mux.xml         |    1 -
 gr-blocks/include/blocks/add_XX.h.t                |    3 +-
 gr-blocks/include/blocks/add_const_XX.h.t          |    2 +-
 gr-blocks/include/blocks/add_const_vXX.h.t         |    2 +-
 gr-blocks/include/blocks/add_ff.h                  |    7 +
 gr-blocks/include/blocks/and_XX.h.t                |    2 +-
 gr-blocks/include/blocks/and_const_XX.h.t          |    2 +-
 gr-blocks/include/blocks/annotator_1to1.h          |    1 +
 gr-blocks/include/blocks/annotator_alltoall.h      |    1 +
 gr-blocks/include/blocks/annotator_raw.h           |    1 +
 gr-blocks/include/blocks/argmax_XX.h.t             |    3 +-
 gr-blocks/include/blocks/burst_tagger.h            |    4 +-
 gr-blocks/include/blocks/char_to_float.h           |   11 +-
 gr-blocks/include/blocks/char_to_short.h           |    4 +-
 gr-blocks/include/blocks/check_lfsr_32k_s.h        |    1 +
 gr-blocks/include/blocks/complex_to_arg.h          |    9 +-
 gr-blocks/include/blocks/complex_to_float.h        |    9 +-
 gr-blocks/include/blocks/complex_to_imag.h         |    9 +-
 .../include/blocks/complex_to_interleaved_short.h  |    6 +-
 gr-blocks/include/blocks/complex_to_mag.h          |    9 +-
 gr-blocks/include/blocks/complex_to_mag_squared.h  |    9 +-
 gr-blocks/include/blocks/complex_to_real.h         |    9 +-
 gr-blocks/include/blocks/conjugate_cc.h            |    2 +-
 gr-blocks/include/blocks/copy.h                    |    1 +
 gr-blocks/include/blocks/ctrlport_probe2_c.h       |    3 +
 gr-blocks/include/blocks/ctrlport_probe_c.h        |    3 +
 gr-blocks/include/blocks/deinterleave.h            |    9 +-
 gr-blocks/include/blocks/divide_XX.h.t             |    3 +-
 gr-blocks/include/blocks/endian_swap.h             |   10 +-
 gr-blocks/include/blocks/file_descriptor_sink.h    |    2 +-
 gr-blocks/include/blocks/file_descriptor_source.h  |    2 +-
 gr-blocks/include/blocks/file_meta_sink.h          |    3 +-
 gr-blocks/include/blocks/file_meta_source.h        |    3 +-
 gr-blocks/include/blocks/file_sink.h               |    2 +-
 gr-blocks/include/blocks/file_source.h             |    2 +-
 gr-blocks/include/blocks/float_to_char.h           |   12 +-
 gr-blocks/include/blocks/float_to_complex.h        |    9 +-
 gr-blocks/include/blocks/float_to_int.h            |   14 +-
 gr-blocks/include/blocks/float_to_short.h          |   12 +-
 gr-blocks/include/blocks/float_to_uchar.h          |    5 +-
 gr-blocks/include/blocks/head.h                    |    3 +-
 gr-blocks/include/blocks/int_to_float.h            |   14 +-
 gr-blocks/include/blocks/integrate_XX.h.t          |    2 +-
 gr-blocks/include/blocks/interleave.h              |    9 +-
 .../include/blocks/interleaved_short_to_complex.h  |    6 +-
 gr-blocks/include/blocks/keep_m_in_n.h             |   12 +-
 gr-blocks/include/blocks/keep_one_in_n.h           |   10 +-
 gr-blocks/include/blocks/lfsr_15_1_0.h             |    1 +
 gr-blocks/include/blocks/lfsr_32k.h                |    1 +
 gr-blocks/include/blocks/lfsr_32k_source_s.h       |    1 +
 gr-blocks/include/blocks/max_XX.h.t                |    3 +-
 gr-blocks/include/blocks/message_burst_source.h    |    2 +-
 gr-blocks/include/blocks/message_debug.h           |    5 +-
 gr-blocks/include/blocks/message_sink.h            |    2 +-
 gr-blocks/include/blocks/message_source.h          |    2 +-
 gr-blocks/include/blocks/message_strobe.h          |    3 +-
 gr-blocks/include/blocks/moving_average_XX.h.t     |    2 +-
 gr-blocks/include/blocks/multiply_XX.h.t           |    3 +-
 gr-blocks/include/blocks/multiply_cc.h             |    7 +
 gr-blocks/include/blocks/multiply_conjugate_cc.h   |    4 +
 gr-blocks/include/blocks/multiply_const_XX.h.t     |    2 +-
 gr-blocks/include/blocks/multiply_const_cc.h       |    2 +-
 gr-blocks/include/blocks/multiply_const_ff.h       |    2 +-
 gr-blocks/include/blocks/multiply_ff.h             |    7 +
 gr-blocks/include/blocks/mute_XX.h.t               |    2 +-
 gr-blocks/include/blocks/nlog10_ff.h               |    2 +-
 gr-blocks/include/blocks/not_XX.h.t                |    2 +-
 gr-blocks/include/blocks/null_sink.h               |    2 +-
 gr-blocks/include/blocks/null_source.h             |    2 +-
 gr-blocks/include/blocks/or_XX.h.t                 |    2 +-
 gr-blocks/include/blocks/pack_k_bits_bb.h          |    2 +-
 gr-blocks/include/blocks/packed_to_unpacked_XX.h.t |    3 +-
 gr-blocks/include/blocks/patterned_interleaver.h   |   35 +++-
 gr-blocks/include/blocks/pdu_to_tagged_stream.h    |    2 +-
 gr-blocks/include/blocks/peak_detector2_fb.h       |   22 ++-
 gr-blocks/include/blocks/peak_detector_XX.h.t      |    3 +-
 gr-blocks/include/blocks/plateau_detector_fb.h     |    5 +-
 gr-blocks/include/blocks/probe_rate.h              |    1 +
 gr-blocks/include/blocks/probe_signal_X.h.t        |    2 +-
 gr-blocks/include/blocks/probe_signal_vX.h.t       |    1 +
 gr-blocks/include/blocks/random_pdu.h              |    3 +-
 gr-blocks/include/blocks/regenerate_bb.h           |    3 +-
 gr-blocks/include/blocks/repack_bits_bb.h          |    3 +-
 gr-blocks/include/blocks/repeat.h                  |   13 +-
 gr-blocks/include/blocks/rms_cf.h                  |    2 +-
 gr-blocks/include/blocks/rms_ff.h                  |    2 +-
 gr-blocks/include/blocks/sample_and_hold_XX.h.t    |    3 +-
 gr-blocks/include/blocks/short_to_char.h           |   12 +-
 gr-blocks/include/blocks/short_to_float.h          |   12 +-
 gr-blocks/include/blocks/skiphead.h                |    3 +-
 gr-blocks/include/blocks/socket_pdu.h              |    2 +-
 gr-blocks/include/blocks/stream_mux.h              |    3 +-
 gr-blocks/include/blocks/stream_to_streams.h       |   10 +-
 gr-blocks/include/blocks/stream_to_vector.h        |    9 +-
 gr-blocks/include/blocks/streams_to_stream.h       |   10 +-
 gr-blocks/include/blocks/streams_to_vector.h       |    9 +-
 gr-blocks/include/blocks/stretch_ff.h              |    5 +-
 gr-blocks/include/blocks/sub_XX.h.t                |    3 +-
 gr-blocks/include/blocks/tag_debug.h               |    5 +-
 gr-blocks/include/blocks/tagged_file_sink.h        |    4 +-
 gr-blocks/include/blocks/tagged_stream_mux.h       |    8 +-
 gr-blocks/include/blocks/tagged_stream_to_pdu.h    |    2 +-
 gr-blocks/include/blocks/threshold_ff.h            |    3 +-
 gr-blocks/include/blocks/throttle.h                |    1 +
 gr-blocks/include/blocks/transcendental.h          |    2 +
 gr-blocks/include/blocks/tuntap_pdu.h              |    2 +-
 gr-blocks/include/blocks/uchar_to_float.h          |    6 +-
 gr-blocks/include/blocks/udp_sink.h                |    2 +-
 gr-blocks/include/blocks/udp_source.h              |    2 +-
 gr-blocks/include/blocks/unpack_k_bits_bb.h        |    2 +-
 gr-blocks/include/blocks/unpacked_to_packed_XX.h.t |    3 +-
 gr-blocks/include/blocks/vco_f.h                   |    4 +-
 gr-blocks/include/blocks/vector_insert_X.h.t       |    9 +-
 gr-blocks/include/blocks/vector_map.h              |    1 +
 gr-blocks/include/blocks/vector_sink_X.h.t         |    2 +-
 gr-blocks/include/blocks/vector_source_X.h.t       |    2 +-
 gr-blocks/include/blocks/vector_to_stream.h        |    9 +-
 gr-blocks/include/blocks/vector_to_streams.h       |   10 +-
 gr-blocks/include/blocks/wavfile.h                 |    3 +
 gr-blocks/include/blocks/wavfile_sink.h            |   12 +-
 gr-blocks/include/blocks/wavfile_source.h          |    4 +-
 gr-blocks/include/blocks/xor_XX.h.t                |    2 +-
 gr-blocks/lib/probe_rate_impl.h                    |    4 -
 gr-channels/include/channels/channel_model.h       |    3 +-
 gr-channels/include/channels/fading_model.h        |    4 +-
 gr-digital/doc/digital.dox                         |    2 +-
 gr-digital/examples/demod/ber_simulation.grc       |    8 +-
 gr-digital/examples/demod/digital_freq_lock.grc    |    6 +-
 gr-digital/examples/demod/mpsk_demod.grc           |    6 +-
 gr-digital/examples/demod/pam_sync.grc             |    6 +-
 gr-digital/examples/demod/pam_timing.grc           |    6 +-
 gr-digital/grc/digital_block_tree.xml              |  208 +++++++++----------
 gr-digital/grc/digital_ofdm_mod2.xml               |    1 -
 .../digital_packet_headergenerator_bb_default.xml  |    2 +-
 gr-digital/include/digital/additive_scrambler_bb.h |    1 +
 gr-digital/include/digital/binary_slicer_fb.h      |    4 +-
 gr-digital/include/digital/clock_recovery_mm_cc.h  |    4 +-
 gr-digital/include/digital/clock_recovery_mm_ff.h  |    4 +-
 gr-digital/include/digital/cma_equalizer_cc.h      |    4 +-
 gr-digital/include/digital/constellation.h         |    3 +-
 .../include/digital/constellation_decoder_cb.h     |    4 +-
 .../include/digital/constellation_receiver_cb.h    |    5 +-
 .../include/digital/correlate_access_code_bb.h     |    5 +-
 .../include/digital/correlate_access_code_tag_bb.h |    3 +-
 gr-digital/include/digital/costas_loop_cc.h        |    6 +-
 gr-digital/include/digital/cpmmod_bc.h             |    5 +-
 gr-digital/include/digital/crc32.h                 |    3 +-
 gr-digital/include/digital/crc32_bb.h              |    3 +-
 gr-digital/include/digital/descrambler_bb.h        |    1 +
 gr-digital/include/digital/diff_decoder_bb.h       |    3 +-
 gr-digital/include/digital/diff_encoder_bb.h       |    3 +-
 gr-digital/include/digital/diff_phasor_cc.h        |    3 +-
 gr-digital/include/digital/fll_band_edge_cc.h      |    6 +-
 gr-digital/include/digital/framer_sink_1.h         |    3 +-
 gr-digital/include/digital/glfsr.h                 |    4 +-
 gr-digital/include/digital/glfsr_source_b.h        |    2 +-
 gr-digital/include/digital/glfsr_source_f.h        |    2 +-
 gr-digital/include/digital/header_payload_demux.h  |    3 +-
 gr-digital/include/digital/kurtotic_equalizer_cc.h |    4 +-
 gr-digital/include/digital/lfsr.h                  |    1 +
 gr-digital/include/digital/lms_dd_equalizer_cc.h   |    4 +-
 gr-digital/include/digital/map_bb.h                |    3 +-
 gr-digital/include/digital/mpsk_receiver_cc.h      |    5 +-
 gr-digital/include/digital/mpsk_snr_est.h          |    7 +-
 gr-digital/include/digital/mpsk_snr_est_cc.h       |   34 ++--
 .../include/digital/ofdm_carrier_allocator_cvc.h   |    1 +
 gr-digital/include/digital/ofdm_chanest_vcvc.h     |    3 +-
 gr-digital/include/digital/ofdm_cyclic_prefixer.h  |    1 +
 gr-digital/include/digital/ofdm_equalizer_base.h   |    2 +-
 .../include/digital/ofdm_equalizer_simpledfe.h     |    3 +-
 gr-digital/include/digital/ofdm_equalizer_static.h |   15 +-
 .../include/digital/ofdm_frame_acquisition.h       |    2 +-
 .../include/digital/ofdm_frame_equalizer_vcvc.h    |    3 +-
 gr-digital/include/digital/ofdm_frame_sink.h       |    2 +-
 gr-digital/include/digital/ofdm_insert_preamble.h  |    7 +-
 gr-digital/include/digital/ofdm_mapper_bcv.h       |    2 +-
 gr-digital/include/digital/ofdm_serializer_vcc.h   |    1 +
 gr-digital/include/digital/ofdm_sync_sc_cfb.h      |    3 +-
 gr-digital/include/digital/packet_header_default.h |    3 +-
 gr-digital/include/digital/packet_header_ofdm.h    |    1 -
 .../include/digital/packet_headergenerator_bb.h    |    3 +-
 gr-digital/include/digital/packet_headerparser_b.h |    4 +-
 gr-digital/include/digital/packet_sink.h           |    3 +-
 gr-digital/include/digital/pfb_clock_sync_ccf.h    |    7 +-
 gr-digital/include/digital/pfb_clock_sync_fff.h    |    7 +-
 gr-digital/include/digital/pn_correlator_cc.h      |    4 +-
 gr-digital/include/digital/probe_density_b.h       |    6 +-
 gr-digital/include/digital/probe_mpsk_snr_est_c.h  |   35 ++--
 gr-digital/include/digital/scrambler_bb.h          |    1 +
 gr-digital/include/digital/simple_correlator.h     |    3 +-
 gr-digital/include/digital/simple_framer.h         |    4 +-
 gr-digital/include/digital/simple_framer_sync.h    |    7 +-
 gr-fcd/grc/fcd_source_c.xml                        |    2 +-
 gr-fcd/include/fcd/fcd_source_c.h                  |    6 +-
 gr-fec/doc/fec.dox                                 |    2 +-
 gr-fec/grc/fec_block_tree.xml                      |    2 +-
 gr-fec/include/fec/decode_ccsds_27_fb.h            |    3 +-
 gr-fec/include/fec/encode_ccsds_27_bb.h            |    3 +-
 gr-fft/grc/fft_block_tree.xml                      |    6 +-
 gr-fft/include/fft/fft_vcc.h                       |   12 +-
 gr-fft/include/fft/fft_vfc.h                       |    8 +-
 gr-fft/include/fft/goertzel_fc.h                   |    8 +-
 gr-filter/grc/filter_block_tree.xml                |   16 +-
 gr-filter/include/filter/adaptive_fir_ccc.h        |    1 +
 gr-filter/include/filter/adaptive_fir_ccf.h        |    1 +
 gr-filter/include/filter/dc_blocker_cc.h           |   50 +++---
 gr-filter/include/filter/dc_blocker_ff.h           |   53 +++---
 gr-filter/include/filter/fft_filter.h              |    1 +
 gr-filter/include/filter/fft_filter_ccc.h          |   49 +++--
 gr-filter/include/filter/fft_filter_fff.h          |   49 +++--
 gr-filter/include/filter/filter_delay_fc.h         |   39 ++--
 gr-filter/include/filter/fir_filter_XXX.h.t        |    5 +-
 .../include/filter/fractional_interpolator_cc.h    |    2 +-
 .../include/filter/fractional_interpolator_ff.h    |    2 +-
 .../include/filter/freq_xlating_fir_filter_XXX.h.t |    2 +-
 gr-filter/include/filter/hilbert_fc.h              |   16 +-
 gr-filter/include/filter/iir_filter_ffd.h          |    5 +-
 gr-filter/include/filter/interp_fir_filter_XXX.h.t |    2 +-
 .../include/filter/mmse_fir_interpolator_cc.h      |    2 +-
 .../include/filter/mmse_fir_interpolator_ff.h      |    1 +
 gr-filter/include/filter/pfb_arb_resampler_ccf.h   |    7 +-
 gr-filter/include/filter/pfb_arb_resampler_fff.h   |    7 +-
 gr-filter/include/filter/pfb_channelizer_ccf.h     |    7 +-
 gr-filter/include/filter/pfb_decimator_ccf.h       |    6 +-
 gr-filter/include/filter/pfb_interpolator_ccf.h    |    7 +-
 gr-filter/include/filter/pfb_synthesizer_ccf.h     |    7 +-
 gr-filter/include/filter/pm_remez.h                |    2 +-
 gr-filter/include/filter/polyphase_filterbank.h    |    4 +-
 .../include/filter/rational_resampler_base_XXX.h.t |    7 +-
 .../include/filter/single_pole_iir_filter_cc.h     |    1 +
 .../include/filter/single_pole_iir_filter_ff.h     |    1 +
 gr-noaa/include/noaa/hrpt_decoder.h                |    4 +
 gr-noaa/include/noaa/hrpt_deframer.h               |    4 +
 gr-noaa/include/noaa/hrpt_pll_cf.h                 |    4 +
 gr-pager/include/pager/flex_frame.h                |    1 +
 gr-qtgui/grc/qtgui_block_tree.xml                  |   44 +++--
 gr-qtgui/include/qtgui/ConstellationDisplayPlot.h  |    4 +
 gr-qtgui/include/qtgui/DisplayPlot.h               |    4 +
 gr-qtgui/include/qtgui/FrequencyDisplayPlot.h      |    4 +
 gr-qtgui/include/qtgui/SpectrumGUIClass.h          |    4 +
 gr-qtgui/include/qtgui/TimeDomainDisplayPlot.h     |    4 +
 gr-qtgui/include/qtgui/TimeRasterDisplayPlot.h     |    4 +
 gr-qtgui/include/qtgui/WaterfallDisplayPlot.h      |    4 +
 gr-qtgui/include/qtgui/const_sink_c.h              |    2 +
 gr-qtgui/include/qtgui/constellationdisplayform.h  |    4 +
 gr-qtgui/include/qtgui/displayform.h               |    4 +
 gr-qtgui/include/qtgui/freq_sink_c.h               |    2 +
 gr-qtgui/include/qtgui/freq_sink_f.h               |    2 +
 gr-qtgui/include/qtgui/freqdisplayform.h           |    4 +
 gr-qtgui/include/qtgui/plot_raster.h               |   19 +-
 gr-qtgui/include/qtgui/plot_waterfall.h            |   19 +-
 gr-qtgui/include/qtgui/sink_c.h                    |    2 +
 gr-qtgui/include/qtgui/sink_f.h                    |    2 +
 gr-qtgui/include/qtgui/time_raster_sink_b.h        |    2 +
 gr-qtgui/include/qtgui/time_raster_sink_f.h        |    2 +
 gr-qtgui/include/qtgui/time_sink_c.h               |    2 +
 gr-qtgui/include/qtgui/time_sink_f.h               |    2 +
 gr-qtgui/include/qtgui/timedisplayform.h           |    4 +
 gr-qtgui/include/qtgui/timerasterdisplayform.h     |    4 +
 gr-qtgui/include/qtgui/waterfall_sink_c.h          |    2 +
 gr-qtgui/include/qtgui/waterfall_sink_f.h          |    2 +
 gr-qtgui/include/qtgui/waterfalldisplayform.h      |    4 +
 .../examples/grc/interference_cancellation.grc     |   20 +-
 gr-trellis/examples/grc/pccc.grc                   |    8 +-
 gr-trellis/examples/grc/pccc1.grc                  |    8 +-
 gr-trellis/examples/grc/sccc.grc                   |    8 +-
 gr-trellis/examples/grc/sccc1.grc                  |    8 +-
 gr-trellis/grc/trellis_encoder_xx.xml              |    2 +-
 gr-trellis/grc/trellis_metrics_x.xml               |    2 +-
 .../grc/trellis_pccc_decoder_combined_xx.xml       |    2 +-
 gr-trellis/grc/trellis_pccc_decoder_x.xml          |    2 +-
 gr-trellis/grc/trellis_pccc_encoder_xx.xml         |    2 +-
 gr-trellis/grc/trellis_permutation.xml             |    2 +-
 .../grc/trellis_sccc_decoder_combined_xx.xml       |    2 +-
 gr-trellis/grc/trellis_sccc_decoder_x.xml          |    2 +-
 gr-trellis/grc/trellis_sccc_encoder_xx.xml         |    2 +-
 gr-trellis/grc/trellis_siso_combined_f.xml         |    2 +-
 gr-trellis/grc/trellis_siso_f.xml                  |    2 +-
 gr-trellis/grc/trellis_viterbi_combined_xx.xml     |    2 +-
 gr-trellis/grc/trellis_viterbi_x.xml               |    2 +-
 .../include/trellis/constellation_metrics_cf.h     |    2 +-
 gr-trellis/include/trellis/encoder_XX.h.t          |    2 +-
 gr-trellis/include/trellis/fsm.h                   |    2 +
 gr-trellis/include/trellis/interleaver.h           |    1 +
 gr-trellis/include/trellis/metrics_X.h.t           |    2 +-
 gr-trellis/include/trellis/pccc_decoder_X.h.t      |    2 +-
 .../include/trellis/pccc_decoder_combined_XX.h.t   |    2 +-
 gr-trellis/include/trellis/pccc_encoder_XX.h.t     |   16 +-
 gr-trellis/include/trellis/permutation.h           |    2 +-
 gr-trellis/include/trellis/sccc_decoder_X.h.t      |    2 +-
 .../include/trellis/sccc_decoder_combined_XX.h.t   |    2 +-
 gr-trellis/include/trellis/sccc_encoder_XX.h.t     |    2 +-
 gr-trellis/include/trellis/siso_combined_f.h       |    2 +-
 gr-trellis/include/trellis/siso_f.h                |    2 +-
 gr-trellis/include/trellis/viterbi_X.h.t           |    2 +-
 gr-trellis/include/trellis/viterbi_combined_XX.h.t |    2 +-
 gr-uhd/examples/grc/uhd_dpsk_mod.grc               |    6 +-
 gr-uhd/examples/grc/uhd_tx_dpsk.grc                |    6 +-
 gr-vocoder/doc/vocoder.dox                         |    3 +-
 gr-vocoder/grc/vocoder_alaw_encode_sb.xml          |    2 +-
 gr-vocoder/grc/vocoder_block_tree.xml              |    2 +-
 gr-vocoder/grc/vocoder_ulaw_decode_bs.xml          |    2 +-
 gr-vocoder/include/vocoder/alaw_decode_bs.h        |    2 +-
 gr-vocoder/include/vocoder/alaw_encode_sb.h        |    2 +-
 gr-vocoder/include/vocoder/codec2_decode_ps.h      |    2 +-
 gr-vocoder/include/vocoder/codec2_encode_sp.h      |    2 +-
 gr-vocoder/include/vocoder/cvsd_decode_bs.h        |    6 +-
 gr-vocoder/include/vocoder/cvsd_encode_sb.h        |    6 +-
 gr-vocoder/include/vocoder/g721_decode_bs.h        |    2 +-
 gr-vocoder/include/vocoder/g721_encode_sb.h        |    2 +-
 gr-vocoder/include/vocoder/g723_24_decode_bs.h     |    2 +-
 gr-vocoder/include/vocoder/g723_24_encode_sb.h     |    2 +-
 gr-vocoder/include/vocoder/g723_40_decode_bs.h     |    2 +-
 gr-vocoder/include/vocoder/g723_40_encode_sb.h     |    2 +-
 gr-vocoder/include/vocoder/gsm_fr_decode_ps.h      |    2 +-
 gr-vocoder/include/vocoder/gsm_fr_encode_sp.h      |    2 +-
 gr-vocoder/include/vocoder/ulaw_decode_bs.h        |    2 +-
 gr-vocoder/include/vocoder/ulaw_encode_sb.h        |    2 +-
 gr-wxgui/grc/notebook.xml                          |    2 +-
 gr-wxgui/grc/variable_check_box.xml                |    2 +-
 gr-wxgui/grc/variable_chooser.xml                  |    2 +-
 gr-wxgui/grc/variable_slider.xml                   |    2 +-
 gr-wxgui/grc/variable_static_text.xml              |    2 +-
 gr-wxgui/grc/variable_text_box.xml                 |    2 +-
 gr-wxgui/grc/wxgui_constellationsink2.xml          |    2 +-
 gr-wxgui/grc/wxgui_fftsink2.xml                    |    2 +-
 gr-wxgui/grc/wxgui_histosink2.xml                  |    2 +-
 gr-wxgui/grc/wxgui_numbersink2.xml                 |    2 +-
 gr-wxgui/grc/wxgui_scopesink2.xml                  |    2 +-
 gr-wxgui/grc/wxgui_termsink.xml                    |    2 +-
 gr-wxgui/grc/wxgui_waterfallsink2.xml              |    2 +-
 grc/blocks/block_tree.xml                          |   41 ++---
 grc/gui/BlockTreeWindow.py                         |    2 +
 378 files changed, 1387 insertions(+), 978 deletions(-)
 rename grc/blocks/random_source_x.xml => 
gr-analog/grc/analog_random_source_x.xml (94%)


hooks/post-receive
-- 
git://gnuradio.org/gnuradio



reply via email to

[Prev in Thread] Current Thread [Next in Thread]