[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 49e085abb7cacbe042ffdbda6c162866d6e8aa36
Merge: c007d8b d241c13
Author: Johnathan Corgan <address@hidden>
Date:   Wed Apr 27 07:25:39 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, 3 insertions(+), 286 deletions(-)