[Commit-gnuradio] [gnuradio] 05/07: Merge remote-tracking branch 'mbr0wn/uhd/usrp_block_grc'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit fb3d384b29e14958f6e0658076bcfdad98e4d4f4
Merge: 7d1ead9 24bf23d
Author: Johnathan Corgan <address@hidden>
Date:   Fri Sep 4 05:27:39 2015 -0700

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

 gr-uhd/grc/gen_uhd_usrp_blocks.py | 108 +++++++++++++++++++++++++++++++++++---
 1 file changed, 100 insertions(+), 8 deletions(-)