diff options
| author | Roman Khassraf <roman@khassraf.at> | 2015-08-05 13:02:12 +0200 |
|---|---|---|
| committer | Roman Khassraf <roman@khassraf.at> | 2015-08-05 13:02:12 +0200 |
| commit | 98da635ccc2e0df06a30bda59ee082d8593dc0a8 (patch) | |
| tree | 63017e27cdddb6450f105a143f3f9fae62d7e38e /grc/CMakeLists.txt | |
| parent | f163ca5957e1f32d981c5ea3ce9f9b24cb9d3a0a (diff) | |
| parent | a1eb188b97d12737d58eed9162102798f440ba43 (diff) | |
Merged origin/flow-control-100 into dev, fixed conflicts
Diffstat (limited to 'grc/CMakeLists.txt')
| -rw-r--r-- | grc/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt index d42bff8..2b94539 100644 --- a/grc/CMakeLists.txt +++ b/grc/CMakeLists.txt @@ -21,6 +21,7 @@ add_subdirectory(decoding) add_subdirectory(decryption) add_subdirectory(demapping) add_subdirectory(receiver) +add_subdirectory(flow_control) add_subdirectory(misc_utils) install(FILES gsm_block_tree.xml DESTINATION share/gnuradio/grc/blocks |