[Commit-gnuradio] [gnuradio] 20/23: Merge remote-tracking branch 'michaelld/boost_once'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit 500bc9983746511195fa94a0c7b2ddee3c8fd54c
Merge: 877ef8a 29abaa9
Author: Tom Rondeau <address@hidden>
Date:   Thu Jun 26 14:47:18 2014 -0400

    Merge remote-tracking branch 'michaelld/boost_once'

 CMakeLists.txt                                | 5 +++++
 volk/CMakeLists.txt                           | 2 +-
 volk/cmake/{GrBoost.cmake => VolkBoost.cmake} | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)