[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next

[git]

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

trondeau pushed a commit to branch next
in repository gnuradio.

commit 4bc1abc0b3bbac6ebefa2527d6b89bd128b1087f
Merge: 3ddbfe5 2a37bd9
Author: Tom Rondeau <address@hidden>
Date:   Sun Jun 29 22:28:22 2014 -0400

    Merge branch 'master' into next

 gnuradio-runtime/CMakeLists.txt               |  40 ++++----
 gnuradio-runtime/include/gnuradio/logger.h.in |  86 +++++++++++++++++
 gnuradio-runtime/include/gnuradio/prefs.h     |   1 -
 gnuradio-runtime/include/pmt/pmt.h            |   3 +-
 gnuradio-runtime/lib/CMakeLists.txt           |  16 +++-
 gnuradio-runtime/lib/block.cc                 |  12 +--
 gnuradio-runtime/lib/logger.cc                |  15 +++
 gnuradio-runtime/lib/pmt/CMakeLists.txt       |  19 +++-
 gnuradio-runtime/lib/pmt/pmt.cc               |   9 +-
 gnuradio-runtime/lib/prefs.cc                 |  16 +---
 gnuradio-runtime/lib/tpb_thread_body.cc       |  40 ++++----
 gnuradio-runtime/python/gnuradio/gr/prefs.py  | 127 --------------------------
 gnuradio-runtime/python/pmt/__init__.py       |   5 +-
 gnuradio-runtime/python/pmt/pmt_to_python.py  |  11 ++-
 gnuradio-runtime/swig/pmt_swig.i              |   6 +-
 gnuradio-runtime/swig/prefs.i                 |   2 -
 gr-analog/lib/CMakeLists.txt                  |  28 ++++--
 gr-atsc/lib/CMakeLists.txt                    |  13 +++
 gr-audio/lib/CMakeLists.txt                   |  13 +++
 gr-blocks/lib/CMakeLists.txt                  |  15 +++
 gr-blocks/python/blocks/qa_keep_one_in_n.py   |   1 -
 gr-channels/lib/CMakeLists.txt                |  20 ++++
 gr-comedi/lib/CMakeLists.txt                  |  13 +++
 gr-digital/lib/CMakeLists.txt                 |  20 ++++
 gr-fec/lib/CMakeLists.txt                     |  13 +++
 gr-fft/lib/CMakeLists.txt                     |  13 +++
 gr-filter/lib/CMakeLists.txt                  |  18 ++++
 gr-noaa/lib/CMakeLists.txt                    |  13 +++
 gr-pager/lib/CMakeLists.txt                   |  13 +++
 gr-qtgui/lib/CMakeLists.txt                   |  23 ++++-
 gr-trellis/lib/CMakeLists.txt                 |  28 +++++-
 gr-video-sdl/lib/CMakeLists.txt               |  18 +++-
 gr-vocoder/lib/CMakeLists.txt                 |  13 +++
 gr-wavelet/lib/CMakeLists.txt                 |  16 ++++
 gr-wxgui/lib/CMakeLists.txt                   |  13 +++
 gr-zeromq/lib/CMakeLists.txt                  |  13 +++
 volk/lib/CMakeLists.txt                       |  14 ++-
 37 files changed, 521 insertions(+), 218 deletions(-)