[Commit-gnuradio] [gnuradio] 05/05: Merge remote-tracking branch 'gnuradio-github/pr/1195'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 0d5fd62c70f5f633b124732a17ed90b061f94941
Merge: aab6e83 6a68b9b
Author: Johnathan Corgan <address@hidden>
Date:   Wed Mar 22 09:22:36 2017 -0700

    Merge remote-tracking branch 'gnuradio-github/pr/1195'

 cmake/Modules/GrSwig.cmake           | 3 ---
 cmake/Modules/UseSWIG.cmake          | 1 +
 gnuradio-runtime/CMakeLists.txt      | 3 +--
 gnuradio-runtime/lib/CMakeLists.txt  | 5 -----
 gnuradio-runtime/swig/CMakeLists.txt | 1 -
 gr-analog/CMakeLists.txt             | 1 +
 gr-audio/lib/CMakeLists.txt          | 4 +---
 gr-blocks/CMakeLists.txt             | 2 ++
 gr-blocks/lib/CMakeLists.txt         | 4 ----
 gr-blocks/tests/CMakeLists.txt       | 6 +-----
 gr-comedi/lib/CMakeLists.txt         | 2 --
 gr-digital/CMakeLists.txt            | 2 --
 gr-digital/lib/CMakeLists.txt        | 4 ----
 gr-dtv/CMakeLists.txt                | 1 +
 gr-dtv/lib/CMakeLists.txt            | 5 -----
 gr-fec/lib/CMakeLists.txt            | 7 ++-----
 gr-fft/CMakeLists.txt                | 1 -
 gr-filter/lib/CMakeLists.txt         | 2 --
 gr-qtgui/lib/CMakeLists.txt          | 3 ---
 gr-trellis/lib/CMakeLists.txt        | 2 --
 gr-uhd/lib/CMakeLists.txt            | 6 ------
 gr-video-sdl/lib/CMakeLists.txt      | 2 --
 gr-vocoder/lib/CMakeLists.txt        | 6 ------
 gr-wavelet/CMakeLists.txt            | 3 ---
 gr-wavelet/lib/CMakeLists.txt        | 7 -------
 gr-wxgui/lib/CMakeLists.txt          | 1 -
 26 files changed, 10 insertions(+), 74 deletions(-)