[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, 13 Jan 2015 20:52:29 +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 126800de8a1b93651a5cf88b99cf3e9f976c056c
Merge: 318e3f4 885fd55
Author: Johnathan Corgan <address@hidden>
Date: Tue Jan 13 12:48:27 2015 -0800
Merge branch 'master' into next
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(-)