[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 fc92ccfc7a5228790c18108140036503f7328dcb
Merge: 6903755 637dc80
Author: Johnathan Corgan <address@hidden>
Date:   Wed Dec 23 18:54:06 2015 -0800

    Merge branch 'next' into next-qt5

 cmake/Modules/FindThrift.cmake                 |  8 ++++++--
 gnuradio-runtime/include/gnuradio/py_feval.h   |  1 -
 gnuradio-runtime/include/gnuradio/sys_pri.h    | 10 +++++-----
 gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt |  2 ++
 gr-vocoder/gnuradio-vocoder.pc.in              |  2 +-
 gr-vocoder/include/gnuradio/vocoder/codec2.h   |  2 +-
 gr-vocoder/lib/CMakeLists.txt                  |  7 -------
 gr-vocoder/swig/CMakeLists.txt                 |  1 -
 volk                                           |  2 +-
 9 files changed, 16 insertions(+), 19 deletions(-)