[Commit-gnuradio] [gnuradio] 06/06: Merge branch 'master_osx'

[git]

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit 24dc96ad6c445f905af9bc3eba1c56e97e3c429d
Merge: e0b8cd4 0b3d00e
Author: Tom Rondeau <address@hidden>
Date:   Sat Mar 8 11:24:08 2014 -0500

    Merge branch 'master_osx'

 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 ++-
 14 files changed, 2708 insertions(+), 1160 deletions(-)