[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'master' into next |
|
Date: |
Tue, 8 Dec 2015 00:31:26 +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 7ec5e1385a70a7ddafa2fbdf9bd023757feedad9
Merge: 6f31b6e 9587f5b
Author: Johnathan Corgan <address@hidden>
Date: Mon Dec 7 16:03:50 2015 -0800
Merge branch 'master' into next
.../examples/ctrlport/usrp_sink_controller.py | 42 ++++++++++++++++++++++
.../examples/ctrlport/usrp_source_control.grc | 14 +++++++-
.../examples/ctrlport/usrp_source_controller.py | 33 +++++++++++------
gr-blocks/lib/tagged_stream_align_impl.cc | 2 +-
gr-uhd/lib/usrp_sink_impl.cc | 13 +++++++
gr-uhd/lib/usrp_sink_impl.h | 2 ++
grc/base/FlowGraph.py | 8 ++++-
grc/blocks/epy_block.xml | 2 +-
grc/blocks/epy_module.xml | 33 +++++++++++++++++
grc/gui/Actions.py | 2 +-
grc/gui/Block.py | 4 +--
grc/gui/Param.py | 2 +-
grc/gui/PropsDialog.py | 12 ++++++-
grc/python/FlowGraph.py | 35 ++++++++++++------
grc/python/Generator.py | 40 ++++++++++++---------
grc/python/Param.py | 2 +-
grc/python/flow_graph.tmpl | 5 ++-
17 files changed, 203 insertions(+), 48 deletions(-)