[Commit-gnuradio] [gnuradio] 05/05: Merge remote-tracking branch 'gnuradio-wg-grc/maint_grcwg' into maint

[git]

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

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 6c121388075c9d7624bef832a5dd835da73798cc
Merge: 65dbd67 b307c89
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jan 13 12:46:06 2015 -0800

    Merge remote-tracking branch 'gnuradio-wg-grc/maint_grcwg' into maint
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.

 grc/base/Block.py                |  9 +++------
 grc/base/Port.py                 | 11 ++++-------
 grc/blocks/gr_message_domain.xml |  1 +
 grc/gui/Connection.py            | 37 +++++++++++++++----------------------
 grc/python/Connection.py         |  2 +-
 grc/python/Port.py               |  1 -
 grc/python/flow_graph.tmpl       |  2 +-
 7 files changed, 25 insertions(+), 38 deletions(-)