[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 4e4d948c893bdb8eb817153b04eb528b4c3de155
Merge: 0632ba1 bb2ed47
Author: Johnathan Corgan <address@hidden>
Date:   Wed Jan 27 10:06:55 2016 -0800

    Merge branch 'master' into next

 cmake/Modules/GrTest.cmake                              |  2 +-
 gnuradio-runtime/lib/block_executor.cc                  | 17 +++++++++++++++--
 gnuradio-runtime/lib/flat_flowgraph.cc                  |  4 ++--
 .../gnuradio/digital/constellation_receiver_cb.h        |  4 +++-
 gr-digital/lib/constellation_receiver_cb_impl.cc        |  3 +--
 gr-digital/lib/constellation_receiver_cb_impl.h         |  3 +--
 gr-digital/lib/costas_loop_cc_impl.cc                   |  2 +-
 gr-filter/lib/pfb_decimator_ccf_impl.cc                 |  1 +
 8 files changed, 25 insertions(+), 11 deletions(-)