[Commit-gnuradio] [gnuradio] 12/12: Merge remote-tracking branch 'martin/uhd/clearer_grc_args'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 5cb67ced9b0735a6a7d0782c801ea0604153bef2
Merge: 740abc0 adc43ad
Author: Johnathan Corgan <address@hidden>
Date:   Fri May 23 10:29:53 2014 -0700

    Merge remote-tracking branch 'martin/uhd/clearer_grc_args'

 gr-uhd/grc/gen_uhd_usrp_blocks.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)