[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 20b26f482ecbf8764b09d50c862f66cefd22fef6
Merge: abdb40b 6fc8f80
Author: Johnathan Corgan <address@hidden>
Date:   Thu Feb 19 00:33:14 2015 -0800

    Merge branch 'master' into next

 gnuradio-runtime/include/gnuradio/block.h          |  2 +-
 gnuradio-runtime/include/gnuradio/buffer.h         |  5 +++
 gr-blocks/lib/qa_blocks.cc                         |  2 +
 gr-blocks/lib/qa_gr_block.cc                       | 47 +++++++++++++++++-----
 gr-blocks/lib/qa_gr_block.h                        |  4 +-
 .../include/gnuradio/filter/pfb_arb_resampler.h    | 12 +++---
 6 files changed, 52 insertions(+), 20 deletions(-)