[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Fri, 27 May 2016 20:18:57 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 0b22497e22e1d0842c6d41a12998a616c31dce3f
Merge: 8d61a99 0e1b710
Author: Johnathan Corgan <address@hidden>
Date: Fri May 27 13:15:18 2016 -0700
Merge branch 'master' into next
gr-analog/grc/analog_block_tree.xml | 2 +-
gr-audio/grc/audio_sink.xml | 2 +-
gr-audio/grc/audio_source.xml | 2 +-
gr-blocks/grc/blks2_error_rate.xml | 2 +-
gr-blocks/grc/blks2_selector.xml | 2 +-
gr-blocks/grc/blks2_tcp_sink.xml | 2 +-
gr-blocks/grc/blks2_tcp_source.xml | 2 +-
gr-blocks/grc/blks2_valve.xml | 2 +-
gr-blocks/grc/blocks_block_tree.xml | 9 +--
gr-channels/grc/channels_block_tree.xml | 2 +-
gr-digital/grc/blks2_packet_decoder.xml | 2 +-
gr-digital/grc/blks2_packet_encoder.xml | 2 +-
gr-digital/grc/digital_block_tree.xml | 2 +-
gr-digital/grc/digital_burst_shaper.xml | 2 +-
gr-dtv/grc/dtv_block_tree.xml | 2 +-
gr-fcd/grc/fcd_source_c.xml | 2 +-
gr-fec/grc/fec_block_tree.xml | 2 +-
gr-fft/grc/fft_block_tree.xml | 2 +-
gr-filter/grc/filter_block_tree.xml | 2 +-
gr-noaa/grc/noaa_hrpt_decoder.xml | 2 +-
gr-noaa/grc/noaa_hrpt_deframer.xml | 2 +-
gr-noaa/grc/noaa_hrpt_pll_cf.xml | 2 +-
gr-pager/grc/pager_flex_deinterleave.xml | 2 +-
gr-pager/grc/pager_flex_sync.xml | 2 +-
gr-pager/grc/pager_slicer_fb.xml | 2 +-
gr-qtgui/grc/qtgui_block_tree.xml | 2 +-
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 +-
gr-uhd/grc/uhd_block_tree.xml | 2 +-
gr-video-sdl/grc/video_block_tree.xml | 2 +-
gr-vocoder/grc/vocoder_block_tree.xml | 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 +-
gr-zeromq/grc/zeromq_pub_msg_sink.xml | 2 +-
gr-zeromq/grc/zeromq_pub_sink.xml | 2 +-
gr-zeromq/grc/zeromq_pull_msg_source.xml | 2 +-
gr-zeromq/grc/zeromq_pull_source.xml | 2 +-
gr-zeromq/grc/zeromq_push_msg_sink.xml | 2 +-
gr-zeromq/grc/zeromq_push_sink.xml | 2 +-
gr-zeromq/grc/zeromq_rep_msg_sink.xml | 2 +-
gr-zeromq/grc/zeromq_rep_sink.xml | 2 +-
gr-zeromq/grc/zeromq_req_msg_source.xml | 2 +-
gr-zeromq/grc/zeromq_req_source.xml | 2 +-
gr-zeromq/grc/zeromq_sub_msg_source.xml | 2 +-
gr-zeromq/grc/zeromq_sub_source.xml | 2 +-
grc/blocks/block_tree.xml | 11 ++-
grc/blocks/epy_block.xml | 1 -
grc/blocks/epy_module.xml | 1 -
grc/blocks/options.xml | 2 +-
grc/blocks/variable_struct.xml.py | 1 -
grc/core/Block.py | 9 +--
grc/core/Constants.py | 1 +
grc/core/Platform.py | 82 +++++++++------------
grc/core/utils/odict.py | 4 +
grc/gui/ActionHandler.py | 5 +-
grc/gui/BlockTreeWindow.py | 85 +++++++++++++++-------
78 files changed, 176 insertions(+), 167 deletions(-)