diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-03 16:09:50 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-08-03 16:09:50 -0700 |
| commit | 675afc063c9ca5ccec3ede43d87aac83c1928182 (patch) | |
| tree | f342b9a24c8c5e93cadce05fc8714001fc0e2ac9 /gr-vocoder/python/vocoder | |
| parent | e2ede2ef8e46762369816d7d66425aee9dca5d1e (diff) | |
| parent | c7692c32cd91c0e98672ce0e997d35f9d3461dd3 (diff) | |
Merge remote-tracking branch 'github/nuke-cpack' into next
Conflicts:
gr-vocoder/CMakeLists.txt
Diffstat (limited to 'gr-vocoder/python/vocoder')
| -rw-r--r-- | gr-vocoder/python/vocoder/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gr-vocoder/python/vocoder/CMakeLists.txt b/gr-vocoder/python/vocoder/CMakeLists.txt index 12f7e77d7c..d4fe3d9e8c 100644 --- a/gr-vocoder/python/vocoder/CMakeLists.txt +++ b/gr-vocoder/python/vocoder/CMakeLists.txt @@ -27,7 +27,6 @@ GR_PYTHON_INSTALL( __init__.py cvsd.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/vocoder - COMPONENT "vocoder_python" ) ######################################################################## |