[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 03/03: Merge remote-tracking branch 'sm0svx
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 03/03: Merge remote-tracking branch 'sm0svx/qtgui-FrequencySink-ControlPanel-AvgSlider-bugfix' into maint |
|
Date: |
Mon, 19 Sep 2016 14:10:12 +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 0ae47375f8de509d059a8a23620458131fecd17e
Merge: b8b73e2 3dc29e7
Author: Johnathan Corgan <address@hidden>
Date: Mon Sep 19 06:51:13 2016 -0700
Merge remote-tracking branch
'sm0svx/qtgui-FrequencySink-ControlPanel-AvgSlider-bugfix' into maint
gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h | 1 +
gr-qtgui/lib/freqcontrolpanel.cc | 13 ++++++++++++-
gr-qtgui/lib/freqdisplayform.cc | 3 +++
3 files changed, 16 insertions(+), 1 deletion(-)