diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-03 16:11:32 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-03 16:11:32 -0700 |
| commit | e09246a4a2514ba0974a3960be86fc50c72e3ee9 (patch) | |
| tree | 437efdefd34810e6c3851b38c4d1f47bb3ecf7b3 /gr-qtgui/python/qtgui | |
| parent | 826b794839b5deaa8d391cbd5be49239443c5c75 (diff) | |
| parent | 675afc063c9ca5ccec3ede43d87aac83c1928182 (diff) | |
Merge branch 'next' into next-qt5
Conflicts:
gr-qtgui/grc/CMakeLists.txt
Diffstat (limited to 'gr-qtgui/python/qtgui')
| -rw-r--r-- | gr-qtgui/python/qtgui/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gr-qtgui/python/qtgui/CMakeLists.txt b/gr-qtgui/python/qtgui/CMakeLists.txt index e1a07fddd6..23e75e6583 100644 --- a/gr-qtgui/python/qtgui/CMakeLists.txt +++ b/gr-qtgui/python/qtgui/CMakeLists.txt @@ -32,7 +32,6 @@ GR_PYTHON_INSTALL( FILES __init__.py "${CMAKE_CURRENT_BINARY_DIR}/range.py" DESTINATION ${GR_PYTHON_DIR}/gnuradio/qtgui - COMPONENT "qtgui_python" ) ######################################################################## |