[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5 |
|
Date: |
Mon, 25 Jul 2016 15:46:08 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next-qt5
in repository gnuradio.
commit 67fbbe02c771d4516c3b3d3c0ccd3a50ca0c4737
Merge: c0afa32 38be5bc
Author: Johnathan Corgan <address@hidden>
Date: Mon Jul 25 08:33:19 2016 -0700
Merge branch 'next' into next-qt5
gr-utils/python/utils/grcc | 14 ++++++++++----
grc/core/Param.py | 6 ++----
grc/gui/BlockTreeWindow.py | 6 +++---
grc/gui/Preferences.py | 4 ++--
4 files changed, 17 insertions(+), 13 deletions(-)