diff options
| author | Josh Blum <josh@joshknows.com> | 2011-09-05 21:15:49 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-09-05 21:15:49 -0700 |
| commit | ca86c6f82d81bbc57bfe898afb8489a419ddbe63 (patch) | |
| tree | 272a4623e6fd247c82d17d01e65ed14f3abe72a4 /gr-uhd/swig | |
| parent | 0ea25051b5126d9761e49ceeb0e5d76aaecd2ca3 (diff) | |
| parent | 492446d2ec6ed85d6437bb35caf4700b02930147 (diff) | |
Merge branch 'next' of gnuradio.org:gnuradio into next
Conflicts:
gr-trellis/src/lib/trellis_permutation.h
Diffstat (limited to 'gr-uhd/swig')
| -rw-r--r-- | gr-uhd/swig/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gr-uhd/swig/__init__.py b/gr-uhd/swig/__init__.py index 6d4ecc7f06..5c0c011b75 100644 --- a/gr-uhd/swig/__init__.py +++ b/gr-uhd/swig/__init__.py @@ -77,6 +77,7 @@ def _prepare_uhd_swig(): #Aliases for deprecated constructors setattr(uhd_swig, 'single_usrp_source', uhd_swig.usrp_source) + setattr(uhd_swig, 'single_usrp_sink', uhd_swig.usrp_sink) setattr(uhd_swig, 'multi_usrp_source', uhd_swig.usrp_source) setattr(uhd_swig, 'multi_usrp_sink', uhd_swig.usrp_sink) |