[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5

[git]

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

jcorgan pushed a commit to branch next-qt5
in repository gnuradio.

commit 4c961d0964ec3a4de0dd5e600d9bb5b3ddf159ad
Merge: 67fbbe0 85012bb
Author: Johnathan Corgan <address@hidden>
Date:   Thu Jul 28 14:36:09 2016 -0700

    Merge branch 'next' into next-qt5

 gr-analog/lib/fmdet_cf_impl.cc                       |  2 +-
 gr-blocks/include/gnuradio/blocks/stream_to_vector.h |  2 +-
 gr-fec/CMakeLists.txt                                |  1 +
 gr-fec/swig/CMakeLists.txt                           |  2 +-
 gr-qtgui/grc/qtgui_number_sink.xml.cmakein           |  2 +-
 grc/core/generator/Generator.py                      |  3 ++-
 grc/gui/ActionHandler.py                             | 13 +++++--------
 grc/gui/BlockTreeWindow.py                           |  2 +-
 8 files changed, 13 insertions(+), 14 deletions(-)