[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 2958d57eae9ff0b4eb06e5956af26ebb570c449a
Merge: d2db181 a32010b
Author: Johnathan Corgan <address@hidden>
Date:   Mon Jan 30 05:30:01 2017 -0800

    Merge branch 'master' into next
    
    Conflicts:
        gr-fec/include/gnuradio/fec/CMakeLists.txt

 gr-blocks/grc/blocks_xor_xx.xml                   |   2 +-
 gr-blocks/lib/peak_detector2_fb_impl.cc           |   3 +-
 gr-blocks/lib/peak_detector_XX_impl.cc.t          |   3 +-
 gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc |   9 +-
 gr-fec/include/gnuradio/fec/CMakeLists.txt        |   4 +
 gr-qtgui/grc/qtgui_time_sink_x.xml                | 112 +++++++++++-----------
 6 files changed, 70 insertions(+), 63 deletions(-)

diff --cc gr-fec/include/gnuradio/fec/CMakeLists.txt
index 5894b1d,3a1a3cf..bbc364e
--- a/gr-fec/include/gnuradio/fec/CMakeLists.txt
+++ b/gr-fec/include/gnuradio/fec/CMakeLists.txt
@@@ -61,7 -61,11 +61,11 @@@ install(FILE
      polar_decoder_common.h
      polar_encoder_systematic.h
      polar_decoder_sc_systematic.h
+     maxstar.h
+     tpc_common.h
+     tpc_decoder.h
 -    tpc_encoder.h DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fec
 -    COMPONENT "fec_devel"
++    tpc_encoder.h
 +    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/fec
  )
  
  if(GSL_FOUND)