[Commit-gnuradio] [gnuradio] 01/01: 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 eae2f6312118bee0ab9e5de08ce68c3f59fb0219
Merge: 4a0fafe 6168622
Author: Johnathan Corgan <address@hidden>
Date:   Tue Mar 31 13:34:04 2015 -0700

    Merge branch 'master' into next

 CMakeLists.txt                            | 60 +++++++++++++++++++++----------
 gnuradio-runtime/lib/CMakeLists.txt       |  2 +-
 gnuradio-runtime/lib/logger.cc            |  4 +--
 gr-analog/lib/CMakeLists.txt              |  2 +-
 gr-audio/lib/osx/circular_buffer.h        |  8 ++---
 gr-audio/lib/osx/osx_impl.cc              | 10 ++----
 gr-blocks/lib/multiply_matrix_ff_impl.cc  |  4 +--
 gr-channels/lib/CMakeLists.txt            |  2 +-
 gr-digital/lib/CMakeLists.txt             |  2 +-
 gr-digital/lib/glfsr.cc                   |  2 +-
 gr-dtv/lib/CMakeLists.txt                 |  2 +-
 gr-filter/lib/pfb_channelizer_ccf_impl.cc |  2 +-
 gr-pager/lib/flex_modes.cc                | 10 +++---
 gr-qtgui/lib/SpectrumGUIClass.cc          | 16 +++++----
 14 files changed, 74 insertions(+), 52 deletions(-)