[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: |
Fri, 10 Jan 2014 21:28:07 +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 b5b8c2c4318a4072bf925c9cf16c9983c254847e
Merge: f3abc0c edaaafc
Author: Tom Rondeau <address@hidden>
Date: Fri Jan 10 16:27:41 2014 -0500
Merge branch 'master' into next
gr-atsc/lib/qa_atsci_equalizer_nop.cc | 6 +-
gr-atsc/lib/qa_atsci_viterbi_decoder.cc | 2 +-
gr-blocks/lib/random_pdu_impl.h | 2 +-
gr-blocks/lib/vector_map_impl.cc | 2 +-
gr-fec/lib/reed-solomon/decode_rs.c | 3 +
gr-fec/lib/reed-solomon/init_rs.c | 2 +
gr-qtgui/lib/const_sink_c_impl.cc | 2 +-
gr-qtgui/lib/freq_sink_c_impl.cc | 2 +-
gr-qtgui/lib/freq_sink_f_impl.cc | 2 +-
gr-qtgui/lib/histogram_sink_f_impl.cc | 2 +-
gr-qtgui/lib/sink_c_impl.cc | 2 +-
gr-qtgui/lib/sink_f_impl.cc | 2 +-
gr-qtgui/lib/time_raster_sink_b_impl.cc | 2 +-
gr-qtgui/lib/time_raster_sink_c_impl.cc | 224 --------------------------
gr-qtgui/lib/time_raster_sink_c_impl.h | 90 -----------
gr-qtgui/lib/time_raster_sink_f_impl.cc | 2 +-
gr-qtgui/lib/time_sink_c_impl.cc | 2 +-
gr-qtgui/lib/time_sink_f_impl.cc | 2 +-
gr-qtgui/lib/waterfall_sink_c_impl.cc | 2 +-
gr-qtgui/lib/waterfall_sink_f_impl.cc | 2 +-
volk/apps/volk_profile.cc | 3 +-
volk/kernels/volk/volk_32fc_s32f_power_32fc.h | 2 +-
volk/lib/testqa.cc | 2 +-
23 files changed, 26 insertions(+), 336 deletions(-)