[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 05/05: Merge remote-tracking branch 'skoslo
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 05/05: Merge remote-tracking branch 'skoslowski/block_comments' |
|
Date: |
Sat, 4 Apr 2015 17:45:41 +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 fa2abde0a0c9c1430ca1c4bb470ddb35e18c0ee2
Merge: e16f948 ad0eb45
Author: Johnathan Corgan <address@hidden>
Date: Sat Apr 4 10:39:03 2015 -0700
Merge remote-tracking branch 'skoslowski/block_comments'
grc/base/Block.py | 12 +++++++++++
grc/gui/ActionHandler.py | 8 ++++++--
grc/gui/Actions.py | 5 +++++
grc/gui/Bars.py | 1 +
grc/gui/Block.py | 28 +++++++++++++++++++++++++
grc/gui/Colors.py | 1 +
grc/gui/FlowGraph.py | 8 +++++++-
grc/gui/Param.py | 53 ++++++++++++++++++++++++++++++++++++++++++++----
grc/gui/PropsDialog.py | 8 ++++++--
grc/python/Param.py | 22 +++++++++-----------
10 files changed, 125 insertions(+), 21 deletions(-)