[Commit-gnuradio] [gnuradio] 14/16: Merge remote-tracking branch 'mbr0wn/uhd/multi_uhd_fft'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 590945d5acda4aa1fbc4ad8a82a6e9969c90f2e2
Merge: 855c3d5 77871a9
Author: Johnathan Corgan <address@hidden>
Date:   Sat Oct 3 11:40:00 2015 -0700

    Merge remote-tracking branch 'mbr0wn/uhd/multi_uhd_fft'

 gr-uhd/apps/uhd_app.py |  14 +-
 gr-uhd/apps/uhd_fft    | 444 ++++++++++++++++++-------------------------------
 2 files changed, 174 insertions(+), 284 deletions(-)