[Commit-gnuradio] [gnuradio] 01/01: 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 c0a88bebb5ac163dd774f113b3eef71ed30221ea
Merge: d8a491f 6020965
Author: Johnathan Corgan <address@hidden>
Date:   Sun Apr 26 15:23:33 2015 -0700

    Merge branch 'maint'

 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(-)