[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, 23 Dec 2014 09:39:00 +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 001b7df201b4fcdfca78abb9ea03d94ecaca2fc2
Merge: 958908e 2402ccc
Author: Johnathan Corgan <address@hidden>
Date: Tue Dec 23 01:31:09 2014 -0800
Merge branch 'master' into next
docs/doxygen/other/msg_passing.dox | 2 +-
gnuradio-runtime/python/gnuradio/gr/hier_block2.py | 139 +++++++++++--------
.../python/gnuradio/gr/qa_hier_block2.py | 91 +++++++++++++
gnuradio-runtime/python/gnuradio/gr/top_block.py | 148 ++++++++-------------
gr-blocks/include/gnuradio/blocks/repack_bits_bb.h | 38 ++++--
grc/base/CMakeLists.txt | 1 +
grc/base/Connection.py | 26 +++-
grc/base/Constants.py | 6 +
grc/base/Element.py | 3 +-
grc/base/Platform.py | 54 +++++++-
grc/base/Port.py | 13 +-
grc/base/{Constants.py => domain.dtd} | 39 +++---
grc/blocks/gr_message_domain.xml | 20 +++
grc/blocks/gr_stream_domain.xml | 18 +++
grc/gui/Block.py | 8 +-
grc/gui/Colors.py | 6 +-
grc/gui/Connection.py | 50 ++++---
grc/gui/Element.py | 14 +-
grc/gui/Port.py | 5 +
grc/python/Block.py | 9 +-
grc/python/Connection.py | 6 +-
grc/python/FlowGraph.py | 17 ++-
grc/python/Generator.py | 71 +++++-----
grc/python/Port.py | 12 +-
grc/python/block.dtd | 5 +-
grc/python/flow_graph.tmpl | 49 +++----
26 files changed, 553 insertions(+), 297 deletions(-)