[Commit-gnuradio] [gnuradio] 02/03: Merge branch 'maint'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit e6fe7162e8fd41eef2140529f0e1b8bcfbde0ae9
Merge: 037ddca c80fcdb
Author: Johnathan Corgan <address@hidden>
Date:   Mon Oct 13 13:44:16 2014 -0700

    Merge branch 'maint'

 cmake/Modules/FindOSS.cmake                      |  5 ++++
 gr-dtv/CMakeLists.txt                            |  3 +++
 gr-utils/python/modtool/gr-newmod/CMakeLists.txt | 32 +++++++++++++++++++++---
 gr-wavelet/lib/CMakeLists.txt                    |  5 ++--
 4 files changed, 38 insertions(+), 7 deletions(-)