[Commit-gnuradio] [gnuradio] 12/14: Merge remote-tracking branch 'mbant/uhd/cids-59-67-master'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit 8be6b663e6bc4893ce03905ad4d41ab85aabb0e2
Merge: 39b8c22 af939aa
Author: Tom Rondeau <address@hidden>
Date:   Wed May 6 12:30:06 2015 -0400

    Merge remote-tracking branch 'mbant/uhd/cids-59-67-master'

 gr-uhd/lib/usrp_sink_impl.cc   | 2 +-
 gr-uhd/lib/usrp_source_impl.cc | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)