[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' 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 e34866dad21a98e901c188df7e87f37ae5502a88
Merge: 4aabba7 762a089
Author: Johnathan Corgan <address@hidden>
Date:   Sun Feb 21 07:33:02 2016 -0800

    Merge branch 'master' into next
    
    Conflicts:
        gr-utils/python/modtool/templates.py

 cmake/Modules/GrVersion.cmake                      |  8 ++++++-
 gr-blocks/lib/tagged_stream_align_impl.cc          |  1 +
 gr-fec/include/gnuradio/fec/polar_decoder_common.h |  6 ++++-
 gr-qtgui/grc/qtgui_const_sink_x.xml                | 18 +++++++++++++++
 gr-qtgui/grc/qtgui_freq_sink_x.xml                 | 18 +++++++++++++++
 gr-qtgui/grc/qtgui_histogram_sink_x.xml            | 18 +++++++++++++++
 gr-qtgui/grc/qtgui_time_raster_x.xml               | 17 ++++++++++++++
 gr-qtgui/grc/qtgui_time_sink_x.xml                 | 18 +++++++++++++++
 gr-qtgui/grc/qtgui_waterfall_sink_x.xml            | 18 +++++++++++++++
 gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h      |  1 +
 gr-qtgui/include/gnuradio/qtgui/const_sink_c.h     |  1 +
 gr-qtgui/include/gnuradio/qtgui/displayform.h      |  3 +++
 gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h      |  1 +
 gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h      |  1 +
 gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h |  1 +
 gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h  |  1 -
 gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h |  1 +
 .../include/gnuradio/qtgui/time_raster_sink_b.h    |  1 +
 .../include/gnuradio/qtgui/time_raster_sink_f.h    |  1 +
 gr-qtgui/include/gnuradio/qtgui/time_sink_c.h      |  1 +
 gr-qtgui/include/gnuradio/qtgui/time_sink_f.h      |  1 +
 gr-qtgui/include/gnuradio/qtgui/timecontrolpanel.h |  2 ++
 gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h |  1 +
 gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h |  1 +
 gr-qtgui/lib/DisplayPlot.cc                        |  9 ++++++++
 gr-qtgui/lib/WaterfallDisplayPlot.cc               |  2 --
 gr-qtgui/lib/const_sink_c_impl.cc                  |  6 +++++
 gr-qtgui/lib/const_sink_c_impl.h                   |  1 +
 gr-qtgui/lib/displayform.cc                        | 16 +++++++++++++
 gr-qtgui/lib/freq_sink_c_impl.cc                   |  6 +++++
 gr-qtgui/lib/freq_sink_c_impl.h                    |  1 +
 gr-qtgui/lib/freq_sink_f_impl.cc                   |  6 +++++
 gr-qtgui/lib/freq_sink_f_impl.h                    |  1 +
 gr-qtgui/lib/freqcontrolpanel.cc                   |  5 ++++
 gr-qtgui/lib/histogram_sink_f_impl.cc              |  6 +++++
 gr-qtgui/lib/histogram_sink_f_impl.h               |  1 +
 gr-qtgui/lib/time_raster_sink_b_impl.cc            |  6 +++++
 gr-qtgui/lib/time_raster_sink_b_impl.h             |  1 +
 gr-qtgui/lib/time_raster_sink_f_impl.cc            |  6 +++++
 gr-qtgui/lib/time_raster_sink_f_impl.h             |  1 +
 gr-qtgui/lib/time_sink_c_impl.cc                   | 10 ++++++--
 gr-qtgui/lib/time_sink_c_impl.h                    |  1 +
 gr-qtgui/lib/time_sink_f_impl.cc                   |  8 ++++++-
 gr-qtgui/lib/time_sink_f_impl.h                    |  1 +
 gr-qtgui/lib/timecontrolpanel.cc                   |  5 ++++
 gr-qtgui/lib/waterfall_sink_c_impl.cc              |  6 +++++
 gr-qtgui/lib/waterfall_sink_c_impl.h               |  1 +
 gr-qtgui/lib/waterfall_sink_f_impl.cc              |  6 +++++
 gr-qtgui/lib/waterfall_sink_f_impl.h               |  1 +
 gr-uhd/apps/uhd_rx_cfile                           | 27 +++++++++++-----------
 gr-utils/python/modtool/modtool_add.py             | 14 +++++++----
 gr-utils/python/modtool/templates.py               |  3 +--
 grc/gui/FlowGraph.py                               |  4 ++++
 53 files changed, 274 insertions(+), 27 deletions(-)

diff --cc gr-utils/python/modtool/templates.py
index 2e222e2,9caf658..1d03d9f
--- a/gr-utils/python/modtool/templates.py
+++ b/gr-utils/python/modtool/templates.py
@@@ -763,11 -750,36 +763,10 @@@ class ${modname.upper()}_API ${modname}
    int work (int noutput_items,
        gr_vector_const_void_star &input_items,
        gr_vector_void_star &output_items);
 -#end if
 +  % endif
  };
 -#end if
 -
 -\#endif /* INCLUDED_${modname.upper()}_${blockname.upper()}_H */
 -
 -'''
 -
 -# C++ file for QA
 -Templates['qa_cpp36'] = '''/* -*- c++ -*- */
 -${str_to_fancyc_comment($license)}
 -
 -\#include <boost/test/unit_test.hpp>
 +% endif
  
 -BOOST_AUTO_TEST_CASE(qa_${modname}_${blockname}_t1){
 -    BOOST_CHECK_EQUAL(2 + 2, 4);
 -    // TODO BOOST_* test macros here
 -}
 -
 -BOOST_AUTO_TEST_CASE(qa_${modname}_${blockname}_t2){
 -    BOOST_CHECK_EQUAL(2 + 2, 4);
 -    // TODO BOOST_* test macros here
 -}
 +#endif /* INCLUDED_${modname.upper()}_${blockname.upper()}_H */
  
  '''
 -
 -# Header file for QA
 -Templates['qa_cmakeentry36'] = """
 -add_executable($basename $filename)
 -target_link_libraries($basename gnuradio-$modname \${Boost_LIBRARIES})
 -GR_ADD_TEST($basename $basename)
 -"""
--