[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 18:42:47 +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 020cfa92cc05fb52d8309dd85e48e1e80094262e
Merge: d6a2418 e876905
Author: Tom Rondeau <address@hidden>
Date: Mon Jul 28 14:42:29 2014 -0400
Merge branch 'master' into next
cmake/Modules/GrMiscUtils.cmake | 12 +-
docs/doxygen/other/build_guide.dox | 52 +-
gr-blocks/lib/file_meta_sink_impl.cc | 6 +-
gr-blocks/lib/file_meta_sink_impl.h | 2 -
gr-blocks/lib/file_meta_source_impl.cc | 8 +-
gr-blocks/lib/file_meta_source_impl.h | 1 -
gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h | 2 -
gr-qtgui/lib/SpectrumGUIClass.cc | 60 +-
gr-qtgui/lib/ber_sink_b_impl.h | 3 -
gr-qtgui/lib/const_sink_c_impl.cc | 7 +-
gr-qtgui/lib/const_sink_c_impl.h | 3 -
gr-qtgui/lib/freq_sink_c_impl.cc | 4 +-
gr-qtgui/lib/freq_sink_c_impl.h | 3 -
gr-qtgui/lib/freq_sink_f_impl.cc | 4 +-
gr-qtgui/lib/freq_sink_f_impl.h | 3 -
gr-qtgui/lib/histogram_sink_f_impl.cc | 4 +-
gr-qtgui/lib/histogram_sink_f_impl.h | 3 -
gr-qtgui/lib/number_sink_impl.cc | 4 +-
gr-qtgui/lib/number_sink_impl.h | 3 -
gr-qtgui/lib/time_raster_sink_b_impl.h | 1 -
gr-qtgui/lib/time_raster_sink_f_impl.h | 1 -
gr-qtgui/lib/time_sink_c_impl.cc | 10 +-
gr-qtgui/lib/time_sink_c_impl.h | 3 -
gr-qtgui/lib/time_sink_f_impl.cc | 10 +-
gr-qtgui/lib/time_sink_f_impl.h | 3 -
gr-qtgui/lib/waterfall_sink_c_impl.cc | 8 +-
gr-qtgui/lib/waterfall_sink_c_impl.h | 1 -
gr-qtgui/lib/waterfall_sink_f_impl.cc | 4 +
gr-qtgui/lib/waterfall_sink_f_impl.h | 1 -
gr-trellis/examples/grc/CMakeLists.txt | 37 +-
.../examples/grc/interference_cancellation.grc | 1673 ++++++++++++--------
gr-trellis/examples/grc/pccc.grc | 653 ++++----
gr-trellis/examples/grc/pccc1.grc | 781 ++++++---
gr-trellis/examples/grc/sccc.grc | 611 +++----
gr-trellis/examples/grc/sccc1.grc | 859 ++++++----
gr-trellis/grc/trellis_encoder_xx.xml | 135 +-
.../grc/trellis_pccc_decoder_combined_xx.xml | 316 ++--
gr-trellis/grc/trellis_pccc_decoder_x.xml | 210 +--
gr-trellis/grc/trellis_pccc_encoder_xx.xml | 178 ++-
.../grc/trellis_sccc_decoder_combined_xx.xml | 314 ++--
gr-trellis/grc/trellis_sccc_decoder_x.xml | 210 +--
gr-trellis/grc/trellis_sccc_encoder_xx.xml | 178 ++-
gr-trellis/grc/trellis_siso_f.xml | 153 +-
gr-trellis/grc/trellis_viterbi_combined_xx.xml | 227 +--
gr-trellis/grc/trellis_viterbi_x.xml | 115 +-
volk/lib/CMakeLists.txt | 6 +-
46 files changed, 3959 insertions(+), 2923 deletions(-)