[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5 |
Date: |
Wed, 27 Jan 2016 18:20:25 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next-qt5
in repository gnuradio.
commit c4de361f5fd6f6ddfb6375995aecd58dd2d442c2
Merge: 11f04bb 4e4d948
Author: Johnathan Corgan <address@hidden>
Date: Wed Jan 27 10:10:53 2016 -0800
Merge branch 'next' into next-qt5
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(-)