[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 85d46c7a5aa0a25462014922a3e0706cdf92db76
Merge: 350466c 55d8f48
Author: Johnathan Corgan <address@hidden>
Date:   Sun Jul 12 09:26:24 2015 -0700

    Merge branch 'master' into next

 gnuradio-runtime/python/gnuradio/gr/gateway.py |   12 +-
 gr-analog/lib/frequency_modulator_fc_impl.cc   |   10 +-
 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 ------------------------
 8 files changed, 132 insertions(+), 1110 deletions(-)