[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: |
Tue, 18 Mar 2014 17:51:51 +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 de605e5dd845d79cc727843d0f9051c8d4f8cd32
Merge: aedd3ca d351818
Author: Tom Rondeau <address@hidden>
Date: Tue Mar 18 13:50:38 2014 -0400
Merge branch 'master' into next
docs/doxygen/Doxyfile.in | 738 ++++++--
docs/doxygen/Doxyfile.swig_doc.in | 665 ++++++--
docs/doxygen/gnuradio_logo_icon.png | Bin 0 -> 2920 bytes
gnuradio-runtime/lib/math/fast_atan2f.cc | 2 +-
gnuradio-runtime/lib/math/qa_fast_atan2f.cc | 88 +-
gnuradio-runtime/lib/math/qa_fast_atan2f.h | 4 +-
gr-digital/grc/digital_block_tree.xml | 3 +-
.../lib/correlate_access_code_tag_bb_impl.cc | 35 +-
gr-qtgui/grc/qtgui_block_tree.xml | 9 +-
gr-qtgui/grc/qtgui_const_sink_x.xml | 1609 +++++++++++++++++-
gr-qtgui/grc/qtgui_freq_sink_x.xml | 785 ++++++++-
gr-qtgui/grc/qtgui_histogram_sink_x.xml | 1475 +++++++++++++++-
gr-qtgui/grc/qtgui_number_sink.xml | 495 ++++++
gr-qtgui/grc/qtgui_time_raster_x.xml | 415 ++++-
gr-qtgui/grc/qtgui_time_sink_x.xml | 1794 ++++++++++++++++++--
gr-qtgui/grc/qtgui_waterfall_sink_x.xml | 438 ++++-
gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt | 3 +
gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h | 3 +-
.../include/gnuradio/qtgui/NumberDisplayPlot.h | 39 +-
gr-qtgui/include/gnuradio/qtgui/const_sink_c.h | 3 +
gr-qtgui/include/gnuradio/qtgui/form_menus.h | 210 ++-
gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h | 5 +-
gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h | 3 +
gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h | 3 +
.../include/gnuradio/qtgui/histogramdisplayform.h | 5 +-
gr-qtgui/include/gnuradio/qtgui/number_sink.h | 114 ++
.../include/gnuradio/qtgui/numberdisplayform.h | 106 ++
gr-qtgui/include/gnuradio/qtgui/sink_c.h | 3 +
gr-qtgui/include/gnuradio/qtgui/sink_f.h | 3 +
.../include/gnuradio/qtgui/spectrumUpdateEvents.h | 26 +-
.../include/gnuradio/qtgui/time_raster_sink_b.h | 3 +
.../include/gnuradio/qtgui/time_raster_sink_f.h | 3 +
gr-qtgui/include/gnuradio/qtgui/time_sink_c.h | 3 +
gr-qtgui/include/gnuradio/qtgui/time_sink_f.h | 3 +
gr-qtgui/include/gnuradio/qtgui/utils.h | 2 +-
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h | 3 +
gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h | 3 +
gr-qtgui/lib/CMakeLists.txt | 5 +
.../lib/NumberDisplayPlot.cc | 56 +-
gr-qtgui/lib/const_sink_c_impl.cc | 6 +
gr-qtgui/lib/const_sink_c_impl.h | 2 +
gr-qtgui/lib/freq_sink_c_impl.cc | 6 +
gr-qtgui/lib/freq_sink_c_impl.h | 2 +
gr-qtgui/lib/freq_sink_f_impl.cc | 6 +
gr-qtgui/lib/freq_sink_f_impl.h | 2 +
gr-qtgui/lib/freqdisplayform.cc | 1 +
gr-qtgui/lib/histogram_sink_f_impl.cc | 6 +
gr-qtgui/lib/histogram_sink_f_impl.h | 2 +
gr-qtgui/lib/histogramdisplayform.cc | 9 +-
gr-qtgui/lib/number_sink_impl.cc | 310 ++++
gr-qtgui/lib/number_sink_impl.h | 117 ++
gr-qtgui/lib/numberdisplayform.cc | 441 +++++
gr-qtgui/lib/qtgui_util.cc | 1 +
gr-qtgui/lib/sink_c_impl.cc | 6 +
gr-qtgui/lib/sink_c_impl.h | 2 +
gr-qtgui/lib/sink_f_impl.cc | 6 +
gr-qtgui/lib/sink_f_impl.h | 2 +
gr-qtgui/lib/spectrumUpdateEvents.cc | 22 +
gr-qtgui/lib/time_raster_sink_b_impl.cc | 6 +
gr-qtgui/lib/time_raster_sink_b_impl.h | 2 +
gr-qtgui/lib/time_raster_sink_f_impl.cc | 6 +
gr-qtgui/lib/time_raster_sink_f_impl.h | 2 +
gr-qtgui/lib/time_sink_c_impl.cc | 6 +
gr-qtgui/lib/time_sink_c_impl.h | 2 +
gr-qtgui/lib/time_sink_f_impl.cc | 6 +
gr-qtgui/lib/time_sink_f_impl.h | 2 +
gr-qtgui/lib/timerasterdisplayform.cc | 5 +
gr-qtgui/lib/waterfall_sink_c_impl.cc | 6 +
gr-qtgui/lib/waterfall_sink_c_impl.h | 2 +
gr-qtgui/lib/waterfall_sink_f_impl.cc | 6 +
gr-qtgui/lib/waterfall_sink_f_impl.h | 2 +
gr-qtgui/swig/qtgui_swig.i | 3 +
gr-uhd/include/gnuradio/uhd/usrp_sink.h | 4 +-
.../include/gnuradio/vocoder/cvsd_decode_bs.h | 4 +-
.../include/gnuradio/vocoder/cvsd_encode_sb.h | 4 +-
grc/base/Block.py | 17 +-
grc/base/Constants.py | 4 +
grc/base/Element.py | 1 +
grc/base/FlowGraph.py | 66 +-
grc/base/Param.py | 4 +
grc/blocks/dummy.xml | 11 +
grc/gui/ActionHandler.py | 12 +-
grc/gui/Block.py | 11 +-
grc/gui/Colors.py | 3 +
grc/gui/DrawingArea.py | 10 +-
grc/gui/Port.py | 3 +-
grc/gui/PropsDialog.py | 128 +-
grc/python/block.dtd | 6 +-
88 files changed, 9658 insertions(+), 797 deletions(-)