[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 04/05: Merge remote-tracking branch 'gnurad
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 04/05: Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg' |
|
Date: |
Fri, 11 Dec 2015 20:27:02 +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 054aa127e0c148b228edb57f72f0b44c8b8b0f33
Merge: 8c69484 bb814b4
Author: Johnathan Corgan <address@hidden>
Date: Fri Dec 11 12:11:03 2015 -0800
Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg'
grc/gui/ActionHandler.py | 6 ++---
grc/gui/Bars.py | 2 +-
grc/gui/MainWindow.py | 2 +-
grc/gui/Preferences.py | 60 +++++++++++++++++++++++++++++-------------------
4 files changed, 42 insertions(+), 28 deletions(-)