[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Mon, 28 Jul 2014 19:14:30 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit c547a429bc728a5c4071bd6795227b561a13cfd6
Merge: 020cfa9 db2c447
Author: Tom Rondeau <address@hidden>
Date: Mon Jul 28 15:14:14 2014 -0400
Merge branch 'master' into next
gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h | 2 +
gr-qtgui/lib/SpectrumGUIClass.cc | 60 +++++++++++-----------
2 files changed, 32 insertions(+), 30 deletions(-)