[Commit-gnuradio] [gnuradio] 05/05: 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 99e0c0adc2c52d4faef2c26bb3e56c36e347c84a
Merge: 36e0bf4 527be63
Author: Johnathan Corgan <address@hidden>
Date:   Tue Aug 26 10:52:18 2014 -0700

    Merge branch 'maint'

 gr-blocks/include/gnuradio/blocks/wavfile.h   | 21 +++++++++++----------
 gr-blocks/lib/stream_to_tagged_stream_impl.cc | 10 ++++++----
 gr-blocks/lib/wavfile.cc                      |  1 -
 gr-blocks/python/blocks/qa_tag_gate.py        | 10 ++++++----
 gr-qtgui/lib/number_sink_impl.cc              |  9 +++++++++
 gr-uhd/python/uhd/__init__.py                 |  2 +-
 6 files changed, 33 insertions(+), 20 deletions(-)