[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 c5e6d08637be1703af6f5905f21deceed49470a8
Merge: 58486e9 c0a88be
Author: Johnathan Corgan <address@hidden>
Date:   Sun Apr 26 15:32:58 2015 -0700

    Merge branch 'master' into next

 gnuradio-runtime/include/gnuradio/tags.h           | 12 +++++
 gnuradio-runtime/python/gnuradio/gr/tag_utils.py   |  2 +-
 gr-blocks/lib/vector_source_X_impl.cc.t            |  3 +-
 gr-blocks/python/blocks/qa_vector_sink_source.py   | 52 ++++++++++++++++++++++
 gr-channels/doc/channels.dox                       | 36 +++++++--------
 .../include/gnuradio/channels/fading_model.h       |  2 +-
 .../gnuradio/channels/selective_fading_model.h     |  8 ++--
 .../include/gnuradio/filter/pfb_channelizer_ccf.h  |  9 ++--
 .../include/gnuradio/filter/pfb_synthesizer_ccf.h  |  8 ++--
 .../include/gnuradio/qtgui/FrequencyDisplayPlot.h  |  1 +
 .../include/gnuradio/qtgui/WaterfallDisplayPlot.h  |  1 +
 gr-qtgui/lib/FrequencyDisplayPlot.cc               |  5 ++-
 gr-qtgui/lib/WaterfallDisplayPlot.cc               |  7 +--
 13 files changed, 109 insertions(+), 37 deletions(-)