[Commit-gnuradio] [gnuradio] 02/04: 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 508aa3d87ba839e454df982d75ec34a02ede70f9
Merge: 0b22497 2b388ea
Author: Johnathan Corgan <address@hidden>
Date:   Mon May 30 13:01:02 2016 -0700

    Merge branch 'master' into next

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