[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 03/05: Merge branch 'master' into next
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 03/05: Merge branch 'master' into next |
Date: |
Sat, 17 Sep 2016 15:44:20 +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 4135d9c0056e3c8d3e97d28a27e60d1d88ded334
Merge: 54ede29 d57a138
Author: Johnathan Corgan <address@hidden>
Date: Sat Sep 17 08:31:23 2016 -0700
Merge branch 'master' into next
gr-qtgui/include/gnuradio/qtgui/freqcontrolpanel.h | 1 +
gr-qtgui/lib/FrequencyDisplayPlot.cc | 1 -
gr-qtgui/lib/freqcontrolpanel.cc | 6 ++++++
gr-qtgui/lib/freqdisplayform.cc | 3 +++
4 files changed, 10 insertions(+), 1 deletion(-)