diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-06 17:18:37 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-06 17:18:37 -0500 |
| commit | 5c18bac20fcbdee03c332e29a676ea8f1481b5ea (patch) | |
| tree | 7988441a1b098d336314bdc8e74979553c7d2d53 /gr-blocks/include/blocks/CMakeLists.txt | |
| parent | 9ac143a654bc581d9a74363fc02e1ad30be93138 (diff) | |
| parent | 64d8f82c531a477262304bf93b98c2de4eb83d35 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/include/digital_constellation.h
gr-digital/lib/digital_constellation.cc
gr-digital/python/qa_constellation.py
gr-digital/python/qa_constellation_receiver.py
gr-digital/python/qam.py
gr-digital/swig/digital_constellation.i
Diffstat (limited to 'gr-blocks/include/blocks/CMakeLists.txt')
| -rw-r--r-- | gr-blocks/include/blocks/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/blocks/CMakeLists.txt index 0da7a0e569..48beaad6e9 100644 --- a/gr-blocks/include/blocks/CMakeLists.txt +++ b/gr-blocks/include/blocks/CMakeLists.txt @@ -157,6 +157,7 @@ install(FILES streams_to_stream.h streams_to_vector.h stretch_ff.h + tag_debug.h tagged_stream_to_pdu.h threshold_ff.h throttle.h |