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

[git]

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

jcorgan pushed a commit to branch next
in repository gnuradio.

commit b742cda8505d7db8eb902012164b8a28c36fbe97
Merge: 70e331d c3a55f7
Author: Johnathan Corgan <address@hidden>
Date:   Mon Oct 13 13:55:09 2014 -0700

    Merge branch 'master' into next

 cmake/Modules/FindOSS.cmake                        |   5 +
 cmake/Modules/FindUHD.cmake                        |  24 +-
 gr-dtv/CMakeLists.txt                              |   3 +
 gr-utils/python/modtool/gr-newmod/CMakeLists.txt   |  32 +-
 .../gr-newmod/cmake/Modules/FindCppUnit.cmake      |   3 +
 .../gr-newmod/cmake/Modules/GrMiscUtils.cmake      | 321 ++++++++++++++++++++-
 .../gr-newmod/cmake/Modules/GrPlatform.cmake       |  10 +-
 .../modtool/gr-newmod/cmake/Modules/GrPython.cmake |  25 +-
 .../modtool/gr-newmod/cmake/Modules/GrSwig.cmake   |  50 +++-
 .../modtool/gr-newmod/cmake/Modules/GrTest.cmake   |  22 +-
 gr-wavelet/lib/CMakeLists.txt                      |   5 +-
 11 files changed, 456 insertions(+), 44 deletions(-)