[Commit-gnuradio] [gnuradio] 11/13: 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 7cb80ee9b5a886f8229dcb8fa5efdc3734c86bcd
Merge: 80d5255 2fa3642
Author: Johnathan Corgan <address@hidden>
Date:   Sat Sep 5 17:21:53 2015 -0700

    Merge branch 'maint'

 gr-blocks/grc/blocks_tag_object.xml             |   1 +
 gr-qtgui/examples/CMakeLists.txt                |   1 +
 gr-qtgui/examples/qtgui_vector_sink_example.grc | 565 +++++++++++++-----------
 3 files changed, 303 insertions(+), 264 deletions(-)