[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 04/04: Merge remote-tracking branch 'gnurad
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 04/04: Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg' |
|
Date: |
Fri, 29 Aug 2014 16:39:01 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 1c9377b3310f45eaaa2e69f81e026166ff7b19ac
Merge: c539f20 b395f09
Author: Johnathan Corgan <address@hidden>
Date: Fri Aug 29 09:25:12 2014 -0700
Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg'
grc/gui/Constants.py | 1 +
grc/gui/FlowGraph.py | 16 +++++++++++-----
grc/gui/Port.py | 30 ++++++++++++++++++++----------
3 files changed, 32 insertions(+), 15 deletions(-)