Merged eb/usrp-install r4723:4727 into trunk.

This moves usrp related .py files from the top-level of site-packages
into site-packages/usrpm.


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4728 221aa14e-8319-0410-a670-987f0aec2ac5

3 files changed, 3 insertions, 3 deletions

diff --git a/gnuradio-examples/python/multi-antenna/multi_fft.py b/gnuradio-examples/python/multi-antenna/multi_fft.py
index ca9c614a8..3a8d48195 100755
--- a/gnuradio-examples/python/multi-antenna/multi_fft.py
+++ b/gnuradio-examples/python/multi-antenna/multi_fft.py
@@ -8,7 +8,7 @@ from gnuradio import optfir
 from optparse import OptionParser
 from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form, slider
 import wx
-import usrp_dbid
+from usrpm import usrp_dbid
 import time
 import os.path
 import sys
diff --git a/gnuradio-examples/python/multi-antenna/multi_file.py b/gnuradio-examples/python/multi-antenna/multi_file.py
index e2a6e04f6..d5a5d8721 100755
--- a/gnuradio-examples/python/multi-antenna/multi_file.py
+++ b/gnuradio-examples/python/multi-antenna/multi_file.py
@@ -8,7 +8,7 @@ from gnuradio import optfir
 from optparse import OptionParser
 from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form, slider
 import wx
-import usrp_dbid
+from usrpm import usrp_dbid
 import time
 import os.path
 import sys
diff --git a/gnuradio-examples/python/multi-antenna/multi_scope.py b/gnuradio-examples/python/multi-antenna/multi_scope.py
index 43aa77b0d..b35e91651 100755
--- a/gnuradio-examples/python/multi-antenna/multi_scope.py
+++ b/gnuradio-examples/python/multi-antenna/multi_scope.py
@@ -8,7 +8,7 @@ from gnuradio import optfir
 from optparse import OptionParser
 from gnuradio.wxgui import stdgui, fftsink, waterfallsink, scopesink, form, slider
 import wx
-import usrp_dbid
+from usrpm import usrp_dbid
 import time
 import os.path
 import sys