[Commit-gnuradio] [gnuradio] 19/22: Merge branch 'port_domains' into master_grcwg

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit b2944c2abbf1a270aaf9842ca66dfdf77e4a0abc
Merge: 3427a66 01b9933
Author: Sebastian Koslowski <address@hidden>
Date:   Fri Dec 19 13:51:08 2014 +0100

    Merge branch 'port_domains' into master_grcwg

 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 ++++++++----------------
 21 files changed, 297 insertions(+), 135 deletions(-)