diff options
| author | Tom <trondeau@vt.edu> | 2009-10-06 10:40:39 -0700 |
|---|---|---|
| committer | Tom <trondeau@vt.edu> | 2009-10-06 10:40:39 -0700 |
| commit | bbd3df51732b2b63ae9d20e9fddd12229cf6b2ef (patch) | |
| tree | dbf63fb638238e389ad970f2f4443299491e8fc6 /gnuradio-examples/python/digital/benchmark_qt_rx.py | |
| parent | 314726ae7457b37f442a2751285b75b0d616c0f4 (diff) | |
| parent | 3f8026a00c261c788357b3a04f5b338a6cda4d0e (diff) | |
Merge branch 'master' into sync
Conflicts:
gr-utils/src/python/gr_plot_qt.py
gr-utils/src/python/pyqt_plot.py
gr-utils/src/python/pyqt_plot.ui
Diffstat (limited to 'gnuradio-examples/python/digital/benchmark_qt_rx.py')
| -rwxr-xr-x | gnuradio-examples/python/digital/benchmark_qt_rx.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-examples/python/digital/benchmark_qt_rx.py b/gnuradio-examples/python/digital/benchmark_qt_rx.py index 33cf94a5c5..0cbb68d23e 100755 --- a/gnuradio-examples/python/digital/benchmark_qt_rx.py +++ b/gnuradio-examples/python/digital/benchmark_qt_rx.py @@ -25,6 +25,7 @@ from gnuradio import usrp from gnuradio import eng_notation from gnuradio.eng_option import eng_option from optparse import OptionParser +from gnuradio import usrp_options import random import struct @@ -33,7 +34,6 @@ import sys # from current dir from receive_path import receive_path from pick_bitrate import pick_rx_bitrate -import usrp_options try: from gnuradio.qtgui import qtgui |