[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 04/05: Merge remote-tracking branch 'skoslo
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 04/05: Merge remote-tracking branch 'skoslowski/dpi_fix' into maint |
|
Date: |
Sat, 12 Nov 2016 14:50:47 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch maint
in repository gnuradio.
commit f708cc395fa46264f692180ec4ced72fb6de62f7
Merge: fd32278 8ffadf8
Author: Johnathan Corgan <address@hidden>
Date: Sat Nov 12 06:26:59 2016 -0800
Merge remote-tracking branch 'skoslowski/dpi_fix' into maint
grc/gui/ActionHandler.py | 8 +++++---
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 ++++++-
6 files changed, 25 insertions(+), 14 deletions(-)
- [Commit-gnuradio] [gnuradio] branch maint updated (fd32278 -> 1775fb0), git, 2016/11/12
- [Commit-gnuradio] [gnuradio] 05/05: Merge remote-tracking branch 'skoslowski/fix_1089' into maint, git, 2016/11/12
- [Commit-gnuradio] [gnuradio] 04/05: Merge remote-tracking branch 'skoslowski/dpi_fix' into maint,
git <=
- [Commit-gnuradio] [gnuradio] 02/05: grc: (minor) remove deprecated use of empty format_spec, git, 2016/11/12
- [Commit-gnuradio] [gnuradio] 03/05: grc: fix initial setting of generate mode (issue #1089), git, 2016/11/12
- [Commit-gnuradio] [gnuradio] 01/05: grc: respect display scaling for block positions, canvas size and props dialog, git, 2016/11/12