[Commit-gnuradio] [gnuradio] 03/05: Merge remote-tracking branch 'ncorgan/ncorgan/swig_ignore_multi_usrp' into maint

[git]

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

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit 0699175beaa775f5016b71f15d0ce53f90dd5892
Merge: 3b6ca99 8296c56
Author: Johnathan Corgan <address@hidden>
Date:   Tue Jul 8 13:30:01 2014 -0700

    Merge remote-tracking branch 'ncorgan/ncorgan/swig_ignore_multi_usrp' into 
maint

 gr-uhd/include/gnuradio/uhd/usrp_sink.h   | 4 +++-
 gr-uhd/include/gnuradio/uhd/usrp_source.h | 4 +++-
 gr-uhd/swig/uhd_swig.i                    | 8 +++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)