[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, 26 Aug 2014 18:02:41 +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 b19ff4d8fe223a5e7ad4cf3295b24cafe4261f84
Merge: 339fd5e 99e0c0a
Author: Johnathan Corgan <address@hidden>
Date: Tue Aug 26 10:57:58 2014 -0700
Merge branch 'master' into next
cmake/Modules/FindUHD.cmake | 118 ++--
gr-blocks/include/gnuradio/blocks/wavfile.h | 21 +-
gr-blocks/lib/stream_to_tagged_stream_impl.cc | 10 +-
gr-blocks/lib/wavfile.cc | 1 -
gr-blocks/python/blocks/qa_tag_gate.py | 10 +-
gr-qtgui/examples/alt.qss | 17 +
gr-qtgui/examples/dark.qss | 11 +
gr-qtgui/examples/qtgui_vector_sink_example.grc | 706 +++++++++++++++++++++
gr-qtgui/grc/qtgui_block_tree.xml | 1 +
gr-qtgui/grc/qtgui_vector_sink_f.xml | 603 ++++++++++++++++++
gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt | 3 +
.../include/gnuradio/qtgui/VectorDisplayPlot.h | 153 +++++
gr-qtgui/include/gnuradio/qtgui/form_menus.h | 22 +-
gr-qtgui/include/gnuradio/qtgui/vector_sink_f.h | 144 +++++
.../include/gnuradio/qtgui/vectordisplayform.h | 94 +++
gr-qtgui/lib/CMakeLists.txt | 5 +
gr-qtgui/lib/VectorDisplayPlot.cc | 629 ++++++++++++++++++
gr-qtgui/lib/number_sink_impl.cc | 9 +
gr-qtgui/lib/vector_sink_f_impl.cc | 437 +++++++++++++
gr-qtgui/lib/vector_sink_f_impl.h | 142 +++++
gr-qtgui/lib/vectordisplayform.cc | 235 +++++++
gr-qtgui/swig/qtgui_swig.i | 3 +
gr-uhd/python/uhd/__init__.py | 2 +-
23 files changed, 3276 insertions(+), 100 deletions(-)