[Commit-gnuradio] [gnuradio] 08/08: Merge remote-tracking branch 'mbr0wn/uhd/fix_antenna_sel' into maint

[git]

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

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 1e232b237e210be17ad635b53a78017cd6778a75
Merge: d602ee1 fbbc544
Author: Johnathan Corgan <address@hidden>
Date:   Fri Feb 5 11:46:52 2016 -0800

    Merge remote-tracking branch 'mbr0wn/uhd/fix_antenna_sel' into maint

 gr-uhd/grc/gen_uhd_usrp_blocks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)