[Commit-gnuradio] [gnuradio] 07/09: Merge remote-tracking branch 'mbr0wn/uhd/stream_args'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit fe73c2625aee072723f83baf3eb9b1720694a241
Merge: 2c2dc2a ec2d278
Author: Johnathan Corgan <address@hidden>
Date:   Wed Feb 4 13:29:00 2015 -0800

    Merge remote-tracking branch 'mbr0wn/uhd/stream_args'

 gr-uhd/include/gnuradio/uhd/usrp_sink.h   | 17 +++++++++++++++++
 gr-uhd/include/gnuradio/uhd/usrp_source.h | 17 +++++++++++++++++
 gr-uhd/lib/usrp_common.h                  | 15 ++++++++++++++-
 gr-uhd/lib/usrp_sink_impl.cc              | 12 +++++++++++-
 gr-uhd/lib/usrp_sink_impl.h               |  3 ++-
 gr-uhd/lib/usrp_source_impl.cc            | 13 ++++++++++++-
 gr-uhd/lib/usrp_source_impl.h             |  1 +
 7 files changed, 74 insertions(+), 4 deletions(-)