[Commit-gnuradio] [gnuradio] 02/03: 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 fdb2f66d7ba100f62ed9629e6bb5179ebda486c6
Merge: 9e133cc 5352def
Author: Johnathan Corgan <address@hidden>
Date:   Sun Jul 12 09:19:29 2015 -0700

    Merge branch 'maint'

 gnuradio-runtime/python/gnuradio/gr/gateway.py |   12 +-
 gr-blocks/lib/CMakeLists.txt                   |    3 +
 gr-blocks/lib/qa_blocks.cc                     |    5 +-
 gr-blocks/lib/qa_gr_block.cc                   |    5 +-
 gr-blocks/lib/qa_gr_flowgraph.cc               |  170 ++--
 gr-blocks/lib/qa_set_msg_handler.cc            |   12 +-
 gr-blocks/lib/sine_table.h                     | 1025 ------------------------
 7 files changed, 128 insertions(+), 1104 deletions(-)