[Commit-gnuradio] [gnuradio] 06/06: Merge remote-tracking branch 'michaelld/cmake_fixes'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 4eb84b1de37d09588a2bebba188804d9526b50eb
Merge: 0bab1f9 0c10990
Author: Johnathan Corgan <address@hidden>
Date:   Fri Aug 29 10:11:47 2014 -0700

    Merge remote-tracking branch 'michaelld/cmake_fixes'

 CMakeLists.txt             | 24 ++++++++++++++++++++++--
 cmake/Modules/GrSwig.cmake |  6 +++---
 volk/CMakeLists.txt        | 27 ++++++++++++++++++++++++++-
 3 files changed, 51 insertions(+), 6 deletions(-)