[Commit-gnuradio] [gnuradio] 13/14: Merge remote-tracking branch 'adi/fix_find_volk'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 2b388eac959cc9b516f5ef6dea4f79d51a540dfd
Merge: d6f725e 1129f2f
Author: Johnathan Corgan <address@hidden>
Date:   Mon May 30 12:38:31 2016 -0700

    Merge remote-tracking branch 'adi/fix_find_volk'

 CMakeLists.txt                                              | 13 ++++++++++++-
 .../{GnuradioConfig.cmake => GnuradioConfig.cmake.in}       |  4 ++++
 2 files changed, 16 insertions(+), 1 deletion(-)