[Commit-gnuradio] [gnuradio] 04/04: Merge remote-tracking branch 'michaelld/volk_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 6168622dd0edfded121c031259ca062eab41b1c7
Merge: d2ed5a6 328db50
Author: Johnathan Corgan <address@hidden>
Date:   Tue Mar 31 11:59:30 2015 -0700

    Merge remote-tracking branch 'michaelld/volk_fixes'

 CMakeLists.txt                      | 60 ++++++++++++++++++++++++++-----------
 gnuradio-runtime/lib/CMakeLists.txt |  2 +-
 gr-analog/lib/CMakeLists.txt        |  2 +-
 gr-channels/lib/CMakeLists.txt      |  2 +-
 gr-digital/lib/CMakeLists.txt       |  2 +-
 gr-dtv/lib/CMakeLists.txt           |  2 +-
 6 files changed, 47 insertions(+), 23 deletions(-)