[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: |
Sat, 12 Nov 2016 14:50:48 +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 caf9120c31b5a0dfbcbc24fdd5d958017a7db963
Merge: 69ab355 8ddebb8
Author: Johnathan Corgan <address@hidden>
Date: Sat Nov 12 06:29:42 2016 -0800
Merge branch 'master' into next
grc/core/utils/epy_block_io.py | 2 +-
grc/gui/ActionHandler.py | 11 +++++++----
grc/gui/Block.py | 15 +++++++--------
grc/gui/Constants.py | 3 +++
grc/gui/FlowGraph.py | 2 +-
grc/gui/PropsDialog.py | 4 +++-
grc/gui/Utils.py | 7 ++++++-
7 files changed, 28 insertions(+), 16 deletions(-)