[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 1fdbcc890f810f031e105be4f00cf9ef516056cb
Merge: ca36e1c 93db96f
Author: Tom Rondeau <address@hidden>
Date:   Fri Jul 18 16:10:45 2014 -0400

    Merge branch 'master' into next

 CMakeLists.txt                                  |  3 +++
 gnuradio-runtime/CMakeLists.txt                 |  8 -------
 gnuradio-runtime/lib/CMakeLists.txt             | 31 +++++++++++++++++++++----
 gnuradio-runtime/lib/block.cc                   |  1 -
 gnuradio-runtime/lib/controlport/CMakeLists.txt |  2 +-
 gr-analog/lib/CMakeLists.txt                    | 12 ++++++++++
 gr-atsc/lib/CMakeLists.txt                      | 12 ++++++++++
 gr-audio/lib/CMakeLists.txt                     | 12 ++++++++++
 gr-blocks/lib/CMakeLists.txt                    | 23 +++++++++++++++++-
 gr-channels/lib/CMakeLists.txt                  | 12 ++++++++++
 gr-comedi/lib/CMakeLists.txt                    | 12 ++++++++++
 gr-digital/lib/CMakeLists.txt                   | 12 ++++++++++
 gr-fec/lib/CMakeLists.txt                       | 12 ++++++++++
 gr-fft/lib/CMakeLists.txt                       | 12 ++++++++++
 gr-filter/lib/CMakeLists.txt                    | 12 ++++++++++
 gr-filter/lib/pfb_channelizer_ccf_impl.cc       |  2 +-
 gr-noaa/lib/CMakeLists.txt                      | 12 ++++++++++
 gr-pager/lib/CMakeLists.txt                     | 12 ++++++++++
 gr-qtgui/lib/CMakeLists.txt                     | 12 ++++++++++
 gr-trellis/lib/CMakeLists.txt                   | 12 ++++++++++
 gr-uhd/lib/CMakeLists.txt                       | 13 -----------
 gr-video-sdl/lib/CMakeLists.txt                 | 12 ++++++++++
 gr-vocoder/lib/CMakeLists.txt                   | 12 ++++++++++
 gr-wavelet/lib/CMakeLists.txt                   | 12 ++++++++++
 gr-wxgui/lib/CMakeLists.txt                     | 12 ++++++++++
 gr-zeromq/lib/CMakeLists.txt                    | 12 ++++++++++
 26 files changed, 270 insertions(+), 29 deletions(-)