[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: |
Thu, 26 Jun 2014 19:54:52 +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 99c6e421159f5b6d58405a868df63f40097fecd0
Merge: d298d4f 71a57cc
Author: Tom Rondeau <address@hidden>
Date: Thu Jun 26 15:53:41 2014 -0400
Merge branch 'master' into next
CMakeLists.txt | 5 +
gnuradio-runtime/ConfigChecks.cmake | 7 +-
gnuradio-runtime/include/gnuradio/attributes.h | 7 ++
gnuradio-runtime/include/gnuradio/tag_checker.h | 16 +--
gnuradio-runtime/lib/pmt/pmt_io.cc | 2 +-
gnuradio-runtime/lib/posix_memalign.cc | 2 +-
gr-blocks/grc/blocks_copy.xml | 5 +
gr-blocks/grc/blocks_head.xml | 1 +
gr-blocks/include/gnuradio/blocks/copy.h | 6 +
gr-blocks/lib/check_lfsr_32k_s_impl.h | 4 +-
gr-blocks/lib/copy_impl.cc | 12 ++
gr-blocks/lib/copy_impl.h | 2 +
gr-blocks/lib/file_source_impl.cc | 1 +
gr-blocks/lib/unpack_k_bits.cc | 4 +-
gr-blocks/python/blocks/qa_file_source_sink.py | 16 +++
.../grc/digital_constellation_receiver_cb.xml | 13 +++
.../gnuradio/digital/constellation_receiver_cb.h | 14 ++-
gr-digital/lib/constellation_receiver_cb_impl.cc | 49 +++++---
gr-digital/lib/constellation_receiver_cb_impl.h | 19 +++-
gr-digital/lib/crc32_async_bb_impl.cc | 3 +-
gr-fec/lib/cc_decoder_impl.cc | 2 +
.../grc/filter_freq_xlating_fir_filter_xxx.xml | 7 ++
.../filter/freq_xlating_fir_filter_XXX.h.t | 11 +-
gr-filter/lib/filterbank_vcvcf_impl.cc | 10 +-
.../lib/freq_xlating_fir_filter_XXX_impl.cc.t | 33 +++++-
gr-filter/lib/freq_xlating_fir_filter_XXX_impl.h.t | 6 +-
gr-qtgui/examples/CMakeLists.txt | 1 +
gr-qtgui/examples/alt.qss | 126 +++++++++++++++++++++
gr-qtgui/grc/qtgui_freq_sink_x.xml | 14 +++
gr-qtgui/grc/qtgui_sink_x.xml | 39 ++++++-
gr-qtgui/grc/qtgui_time_raster_x.xml | 8 ++
gr-qtgui/grc/qtgui_waterfall_sink_x.xml | 41 +++++++
gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h | 5 +
.../include/gnuradio/qtgui/TimeRasterDisplayPlot.h | 6 +-
gr-qtgui/include/gnuradio/qtgui/displayform.h | 2 +-
gr-qtgui/include/gnuradio/qtgui/form_menus.h | 51 ++++++++-
gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h | 15 +++
gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h | 17 ++-
gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h | 11 ++
gr-qtgui/include/gnuradio/qtgui/qtgui_types.h | 34 +++++-
gr-qtgui/include/gnuradio/qtgui/sink_c.h | 17 ++-
gr-qtgui/include/gnuradio/qtgui/sink_f.h | 16 ++-
.../include/gnuradio/qtgui/spectrumUpdateEvents.h | 14 +++
.../include/gnuradio/qtgui/spectrumdisplayform.h | 11 ++
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h | 17 ++-
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h | 15 +++
.../include/gnuradio/qtgui/waterfalldisplayform.h | 11 ++
gr-qtgui/lib/FrequencyDisplayPlot.cc | 32 +++---
gr-qtgui/lib/SpectrumGUIClass.cc | 29 ++++-
gr-qtgui/lib/TimeRasterDisplayPlot.cc | 30 ++++-
gr-qtgui/lib/WaterfallDisplayPlot.cc | 28 ++++-
gr-qtgui/lib/freq_sink_c_impl.cc | 34 ++++++
gr-qtgui/lib/freq_sink_c_impl.h | 5 +
gr-qtgui/lib/freq_sink_f_impl.cc | 34 ++++++
gr-qtgui/lib/freq_sink_f_impl.h | 5 +
gr-qtgui/lib/freqdisplayform.cc | 39 ++++++-
gr-qtgui/lib/sink_c_impl.cc | 38 +++++++
gr-qtgui/lib/sink_c_impl.h | 6 +
gr-qtgui/lib/sink_f_impl.cc | 29 +++++
gr-qtgui/lib/sink_f_impl.h | 5 +
gr-qtgui/lib/spectrumUpdateEvents.cc | 26 +++++
gr-qtgui/lib/spectrumdisplayform.cc | 49 ++++++--
gr-qtgui/lib/spectrumdisplayform.ui | 10 ++
gr-qtgui/lib/waterfall_sink_c_impl.cc | 34 ++++++
gr-qtgui/lib/waterfall_sink_c_impl.h | 5 +
gr-qtgui/lib/waterfall_sink_f_impl.cc | 34 ++++++
gr-qtgui/lib/waterfall_sink_f_impl.h | 5 +
gr-qtgui/lib/waterfalldisplayform.cc | 38 ++++++-
gr-qtgui/swig/qtgui_swig.i | 4 +-
volk/CMakeLists.txt | 2 +-
volk/cmake/{GrBoost.cmake => VolkBoost.cmake} | 4 +-
volk/kernels/volk/volk_32f_binary_slicer_32i.h | 12 +-
72 files changed, 1157 insertions(+), 108 deletions(-)