[Commit-gnuradio] [gnuradio] 04/04: Merge remote-tracking branch 'gnuradio-wg-grc/next_grcwg' into next

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch next
in repository gnuradio.

commit 950159844b526435fd3d8c13c9bdfdbafbd61d5e
Merge: 27e18c0 ace1b8c
Author: Johnathan Corgan <address@hidden>
Date:   Fri Sep 2 09:47:44 2016 -0700

    Merge remote-tracking branch 'gnuradio-wg-grc/next_grcwg' into next

 gr-qtgui/grc/CMakeLists.txt                        | 32 +++++++++++++++++-----
 ...ber_sink_b.xml.cmakein => qtgui_ber_sink_b.xml} |  2 +-
 ...block_tree.xml.cmakein => qtgui_block_tree.xml} |  0
 ...i_check_box.xml.cmakein => qtgui_check_box.xml} |  2 +-
 ...qtgui_chooser.xml.cmakein => qtgui_chooser.xml} |  4 +--
 ...t_sink_x.xml.cmakein => qtgui_const_sink_x.xml} |  2 +-
 ..._box_msg.xml.cmakein => qtgui_edit_box_msg.xml} |  2 +-
 .../{qtgui_entry.xml.cmakein => qtgui_entry.xml}   |  2 +-
 ...eq_sink_x.xml.cmakein => qtgui_freq_sink_x.xml} |  2 +-
 ...nk_x.xml.cmakein => qtgui_histogram_sink_x.xml} |  2 +-
 .../{qtgui_label.xml.cmakein => qtgui_label.xml}   |  2 +-
 ...mber_sink.xml.cmakein => qtgui_number_sink.xml} |  2 +-
 ...sh_button.xml.cmakein => qtgui_push_button.xml} |  2 +-
 .../{qtgui_range.xml.cmakein => qtgui_range.xml}   |  0
 .../{qtgui_sink_x.xml.cmakein => qtgui_sink_x.xml} |  2 +-
 ...tab_widget.xml.cmakein => qtgui_tab_widget.xml} |  2 +-
 ...aster_x.xml.cmakein => qtgui_time_raster_x.xml} |  2 +-
 ...me_sink_x.xml.cmakein => qtgui_time_sink_x.xml} |  2 +-
 ..._sink_f.xml.cmakein => qtgui_vector_sink_f.xml} |  2 +-
 ...nk_x.xml.cmakein => qtgui_waterfall_sink_x.xml} |  2 +-
 grc/blocks/CMakeLists.txt                          | 23 +++++++++++++---
 grc/blocks/{options.xml.cmakein => options.xml}    |  2 +-
 22 files changed, 63 insertions(+), 30 deletions(-)