[Commit-gnuradio] [gnuradio] 03/04: Merge branch 'maint'

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit d2ed5a6669a5a9a80889c805a3c7c1ec44c0085b
Merge: 066003f d817c5f
Author: Johnathan Corgan <address@hidden>
Date:   Tue Mar 31 11:59:20 2015 -0700

    Merge branch 'maint'
    
    Conflicts:
        volk

 gnuradio-runtime/lib/logger.cc            |  4 ++--
 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-digital/lib/glfsr.cc                   |  2 +-
 gr-filter/lib/pfb_channelizer_ccf_impl.cc |  2 +-
 gr-pager/lib/flex_modes.cc                | 10 +++++-----
 gr-qtgui/lib/SpectrumGUIClass.cc          | 16 +++++++++-------
 8 files changed, 27 insertions(+), 29 deletions(-)