[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: |
Sat, 8 Mar 2014 16:32: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 06dab56378a89e39e14ff8ebf66745eee0955b31
Merge: cb07efc 24dc96a
Author: Tom Rondeau <address@hidden>
Date: Sat Mar 8 11:31:50 2014 -0500
Merge branch 'master' into next
docs/doxygen/other/main_page.dox | 33 +-
gnuradio-runtime/lib/prefs.cc | 46 +-
gr-audio/CMakeLists.txt | 2 +-
gr-audio/include/gnuradio/audio/CMakeLists.txt | 14 +-
gr-audio/include/gnuradio/audio/osx_impl.h | 84 ++
gr-audio/lib/CMakeLists.txt | 9 +
gr-audio/lib/osx/gr-audio-osx.conf | 11 +
gr-audio/lib/osx/osx_common.h | 73 +
gr-audio/lib/osx/osx_impl.cc | 313 ++++
gr-audio/lib/osx/osx_impl.h | 78 -
gr-audio/lib/osx/osx_sink.cc | 1015 ++++++++++---
gr-audio/lib/osx/osx_sink.h | 117 +-
gr-audio/lib/osx/osx_source.cc | 1881 +++++++++++++++---------
gr-audio/lib/osx/osx_source.h | 192 ++-
gr-qtgui/doc/qtgui.dox | 6 +
gr-qtgui/examples/dark.qss | 4 +-
gr-qtgui/gr-qtgui.conf | 4 +
gr-qtgui/include/gnuradio/qtgui/utils.h | 9 +
gr-qtgui/lib/const_sink_c_impl.cc | 7 +
gr-qtgui/lib/freq_sink_c_impl.cc | 7 +
gr-qtgui/lib/freq_sink_f_impl.cc | 7 +
gr-qtgui/lib/histogram_sink_f_impl.cc | 7 +
gr-qtgui/lib/qtgui_util.cc | 19 +-
gr-qtgui/lib/sink_c_impl.cc | 7 +
gr-qtgui/lib/sink_f_impl.cc | 7 +
gr-qtgui/lib/time_raster_sink_b_impl.cc | 7 +
gr-qtgui/lib/time_raster_sink_f_impl.cc | 7 +
gr-qtgui/lib/time_sink_c_impl.cc | 7 +
gr-qtgui/lib/time_sink_f_impl.cc | 7 +
gr-qtgui/lib/waterfall_sink_c_impl.cc | 7 +
gr-qtgui/lib/waterfall_sink_f_impl.cc | 7 +
31 files changed, 2831 insertions(+), 1163 deletions(-)