[Commit-gnuradio] [gnuradio] 06/08: Merge remote-tracking branch 'nwest/volk_features'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit 2308ba9568cf3392530345d61288580b4997adc7
Merge: 9d71cfc e708381
Author: Tom Rondeau <address@hidden>
Date:   Thu Mar 6 11:45:29 2014 -0500

    Merge remote-tracking branch 'nwest/volk_features'

 volk/apps/volk_profile.cc                         | 58 +++++++++++++++--------
 volk/python/volk_modtool/volk_modtool_generate.py | 24 +++++++++-
 2 files changed, 59 insertions(+), 23 deletions(-)