diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-28 11:47:51 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-10-28 11:47:51 -0700 |
| commit | ca8fdc31088c260316499c1c27a7ba5a6f3f87f2 (patch) | |
| tree | 28e1b76b82bdae5af9303a84f5388f0e7b77df83 /gnuradio-runtime/python | |
| parent | 8d5e4f6df72b3b3bff601409310678d9c58e78be (diff) | |
| parent | 3fc55073f28ec97036dfe3f5ff9d9a7491f3ea80 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/swig/CMakeLists.txt
gr-digital/swig/digital_swig.i
gr-trellis/swig/CMakeLists.txt
Diffstat (limited to 'gnuradio-runtime/python')
| -rw-r--r-- | gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx index cf67584235..15a2153a0f 100644 --- a/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx +++ b/gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx @@ -46,7 +46,7 @@ except ImportError: "Please check that they are installed and try again." sys.exit(1) -from PyQt4 import QtCore,Qt,Qwt5 +from PyQt4 import QtCore,Qt import PyQt4.QtGui as QtGui import itertools |