[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, 25 Apr 2014 16:44:55 +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 c57dd35101212e4cd373bac97ff1adfa6de4a73b
Merge: 7cd13c0 754cfa7
Author: Tom Rondeau <address@hidden>
Date: Fri Apr 25 12:44:35 2014 -0400
Merge branch 'master' into next
cmake/Modules/GrPython.cmake | 2 +-
docs/doxygen/other/logger.dox | 2 +-
gnuradio-runtime/include/gnuradio/thread/thread.h | 8 +-
gnuradio-runtime/lib/thread/thread.cc | 38 +-
gr-audio/lib/osx/circular_buffer.h | 15 +-
gr-audio/lib/osx/osx_sink.cc | 820 ++++++++++++---------
gr-audio/lib/osx/osx_sink.h | 2 +-
gr-blocks/include/gnuradio/blocks/max_XX.h.t | 8 +-
gr-channels/lib/flat_fader_impl.cc | 2 +-
gr-digital/examples/demod/test_corr_and_sync.grc | 176 +++--
gr-qtgui/grc/qtgui_const_sink_x.xml | 79 ++
gr-qtgui/include/gnuradio/qtgui/const_sink_c.h | 41 +-
.../gnuradio/qtgui/constellationdisplayform.h | 31 +-
gr-qtgui/include/gnuradio/qtgui/time_sink_c.h | 49 +-
gr-qtgui/include/gnuradio/qtgui/time_sink_f.h | 41 +-
gr-qtgui/lib/const_sink_c_impl.cc | 272 +++++--
gr-qtgui/lib/const_sink_c_impl.h | 27 +-
gr-qtgui/lib/constellationdisplayform.cc | 138 +++-
gr-qtgui/lib/time_sink_c_impl.cc | 2 +-
volk/cmake/GrPython.cmake | 2 +-
20 files changed, 1199 insertions(+), 556 deletions(-)