[Commit-gnuradio] [gnuradio] 02/02: Merge remote-tracking branch 'dkozel/uhd_lo_api'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 8820340ae2cb119e177a445f8d9b079759ed2dd7
Merge: 71a7aeb 782a02b
Author: Johnathan Corgan <address@hidden>
Date:   Tue Apr 26 15:36:03 2016 -0700

    Merge remote-tracking branch 'dkozel/uhd_lo_api'

 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(-)