[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: |
Wed, 1 Oct 2014 19:33:01 +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 e4d789e6378af8caecf02439b90fe3d33d8e4f68
Merge: db4b313 d598e49
Author: Johnathan Corgan <address@hidden>
Date: Wed Oct 1 12:31:39 2014 -0700
Merge branch 'master' into next
grc/base/FlowGraph.py | 20 +++++++++++++-------
grc/base/ParseXML.py | 2 +-
grc/base/Port.py | 15 +++++++++++----
grc/blocks/options.xml | 10 +++++-----
grc/gui/ActionHandler.py | 23 +++++++++++++++--------
grc/gui/Block.py | 13 +++++++------
grc/gui/BlockTreeWindow.py | 11 +++++++----
grc/gui/Constants.py | 7 +++++++
grc/gui/MainWindow.py | 12 ++++++------
grc/gui/Messages.py | 8 +++++---
grc/gui/Param.py | 5 +++--
grc/gui/Port.py | 32 ++++++++++++++++++--------------
grc/python/Generator.py | 6 +++---
13 files changed, 101 insertions(+), 63 deletions(-)