[Commit-gnuradio] [gnuradio] 02/03: 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 826b794839b5deaa8d391cbd5be49239443c5c75
Merge: ae05e46 e2ede2e
Author: Johnathan Corgan <address@hidden>
Date:   Wed Aug 3 16:06:08 2016 -0700

    Merge branch 'next' into next-qt5

 CMakeLists.txt                                     |   4 +-
 cmake/Modules/GrMiscUtils.cmake                    |  43 -------
 gnuradio-runtime/CMakeLists.txt                    |   3 +-
 gnuradio-runtime/include/gnuradio/CMakeLists.txt   |  10 +-
 .../include/gnuradio/{logger.h.in => logger.h}     | 140 ---------------------
 gnuradio-runtime/lib/logger.cc                     |  46 -------
 gnuradio-runtime/lib/qa_logger.cc                  |   5 -
 gnuradio-runtime/lib/tpb_thread_body.cc            |   5 -
 gnuradio-runtime/swig/CMakeLists.txt               |   6 -
 gr-fec/lib/generic_decoder.cc                      |   8 +-
 gr-fec/lib/generic_encoder.cc                      |   8 +-
 .../gr-newmod/cmake/Modules/GrMiscUtils.cmake      |  43 -------
 12 files changed, 6 insertions(+), 315 deletions(-)