[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5

[git]

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

jcorgan pushed a commit to branch next-qt5
in repository gnuradio.

commit c007d8ba318ae18400606f56031676bc7f2a0dd2
Merge: 7877632 efbb415
Author: Johnathan Corgan <address@hidden>
Date:   Tue Apr 26 15:36:27 2016 -0700

    Merge branch 'next' into next-qt5

 gr-uhd/grc/gen_uhd_usrp_blocks.py         | 92 ++++++++++++++++++++++++++++-
 gr-uhd/include/gnuradio/uhd/usrp_source.h | 77 ++++++++++++++++++++++++
 gr-uhd/lib/usrp_block_impl.h              |  5 ++
 gr-uhd/lib/usrp_sink_impl.cc              |  2 -
 gr-uhd/lib/usrp_source_impl.cc            | 98 +++++++++++++++++++++++++++++++
 gr-uhd/lib/usrp_source_impl.h             |  9 +++
 gr-uhd/swig/uhd_swig.i                    |  6 ++
 7 files changed, 286 insertions(+), 3 deletions(-)