[Commit-gnuradio] [gnuradio] 01/02: 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 11ce2621937e6fa1d5440c8f485c7a27b9d34d27
Merge: 313990f 45d19af
Author: Johnathan Corgan <address@hidden>
Date:   Mon May 30 13:16:12 2016 -0700

    Merge branch 'next' into next-qt5

 CMakeLists.txt                                     | 38 +++++++++-
 ...nuradioConfig.cmake => GnuradioConfig.cmake.in} |  4 +
 dtools/bin/install-tbb                             | 88 ----------------------
 gr-dtv/lib/dvbt/dvbt_ofdm_sym_acquisition_impl.cc  |  2 +-
 grc/gui/FlowGraph.py                               |  8 +-
 volk                                               |  2 +-
 6 files changed, 48 insertions(+), 94 deletions(-)