[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: |
Wed, 4 Feb 2015 21:59:37 +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 bb2021f087700463151ad27427d17b7df8ff1294
Merge: 8de3c4c 42c1d6d
Author: Johnathan Corgan <address@hidden>
Date: Wed Feb 4 13:51:02 2015 -0800
Merge branch 'master' into next
gnuradio-runtime/lib/block.cc | 5 ++++-
.../include/gnuradio/blocks/multiply_matrix_XX.h.t | 13 ++++++-------
gr-blocks/include/gnuradio/blocks/peak_detector_XX.h.t | 2 +-
gr-blocks/lib/peak_detector_XX_impl.h.t | 2 +-
gr-digital/lib/fll_band_edge_cc_impl.cc | 2 ++
gr-qtgui/lib/SpectrumGUIClass.cc | 8 ++++----
gr-qtgui/lib/freq_sink_c_impl.cc | 2 +-
gr-qtgui/lib/freq_sink_f_impl.cc | 2 +-
gr-qtgui/lib/waterfall_sink_c_impl.cc | 2 +-
gr-qtgui/lib/waterfall_sink_f_impl.cc | 4 ++--
gr-uhd/include/gnuradio/uhd/usrp_sink.h | 17 +++++++++++++++++
gr-uhd/include/gnuradio/uhd/usrp_source.h | 17 +++++++++++++++++
gr-uhd/lib/usrp_common.h | 15 ++++++++++++++-
gr-uhd/lib/usrp_sink_impl.cc | 12 +++++++++++-
gr-uhd/lib/usrp_sink_impl.h | 3 ++-
gr-uhd/lib/usrp_source_impl.cc | 13 ++++++++++++-
gr-uhd/lib/usrp_source_impl.h | 1 +
17 files changed, 97 insertions(+), 23 deletions(-)