[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Tue, 8 Dec 2015 19:40:42 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit cf40d7d12157e558c5bda77d3ce51e13db44f296
Merge: 8bc9c42 a463fec
Author: Johnathan Corgan <address@hidden>
Date: Tue Dec 8 11:32:31 2015 -0800
Merge branch 'master' into next
gnuradio-runtime/include/gnuradio/basic_block.h | 6 +-
gnuradio-runtime/lib/flat_flowgraph.cc | 27 ++++++-
gnuradio-runtime/lib/flat_flowgraph.h | 12 +++
gnuradio-runtime/lib/hier_block2_detail.cc | 90 ++++++++++++++--------
.../python/gnuradio/gr/qa_hier_block2.py | 51 +++++++++++-
.../blocks/qa_hier_block2_message_connections.py | 12 +--
grc/python/flow_graph.tmpl | 4 +-
7 files changed, 152 insertions(+), 50 deletions(-)