[Commit-gnuradio] [gnuradio] 25/25: 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 cc02c4b22a2e17eddfc05863a9f17fb9a5778361
Merge: 34cf3fd 3b0ba5c
Author: Johnathan Corgan <address@hidden>
Date:   Fri May 27 11:54: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              |  8 +++
 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                    | 12 ++++
 7 files changed, 295 insertions(+), 3 deletions(-)