[Commit-gnuradio] [gnuradio] 14/16: Merge remote-tracking branch 'nwest/volk-json'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit a5a7eb7ae359a309f080837871565f22e6d674c0
Merge: 0f17bb0 2433694
Author: Johnathan Corgan <address@hidden>
Date:   Fri Sep 19 11:44:07 2014 -0700

    Merge remote-tracking branch 'nwest/volk-json'

 volk/apps/volk_profile.cc | 61 ++++++++++++++++++++++++++++++++++++++++++++---
 volk/lib/qa_utils.cc      | 32 ++++++++++++++++++-------
 volk/lib/qa_utils.h       | 43 +++++++++++++++++++++++++++++++--
 3 files changed, 123 insertions(+), 13 deletions(-)