diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-20 10:19:13 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-20 10:19:13 -0700 |
| commit | 09d8b895447b1507b80a27053b51361ea1684175 (patch) | |
| tree | 93edf8d2ebedb3ffcf02edd79b16516c6333f0fb /gr-utils | |
| parent | 090103c760a308101e2cbf3630f6bf46a2bb4d8e (diff) | |
| parent | 7a1403796abd4f9df1483482ce06b169a3212be8 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-atsc/lib/qa_atsci_fake_single_viterbi.cc
gr-atsc/lib/qa_atsci_single_viterbi.cc
Diffstat (limited to 'gr-utils')
| -rwxr-xr-x | gr-utils/python/utils/gr_plot_qt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-utils/python/utils/gr_plot_qt b/gr-utils/python/utils/gr_plot_qt index 153359f0c6..9205d23a7e 100755 --- a/gr-utils/python/utils/gr_plot_qt +++ b/gr-utils/python/utils/gr_plot_qt @@ -26,7 +26,7 @@ except ImportError: raise SystemExit, 1 try: - # FIXME: reenable this before committing + # FIXME: re-enable this before committing #from gnuradio.pyqt_plot import Ui_MainWindow from gnuradio.pyqt_plot import Ui_MainWindow except ImportError: |