[Commit-gnuradio] [gnuradio] 13/16: Merge remote-tracking branch 'geiger/master'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 0f17bb0fbf676c8592d5ed67d58c2d489b88bc4a
Merge: 95cde8f 33a43b4
Author: Johnathan Corgan <address@hidden>
Date:   Fri Sep 19 11:42:45 2014 -0700

    Merge remote-tracking branch 'geiger/master'

 volk/lib/CMakeLists.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)