diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-06 11:47:54 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-06 11:47:54 -0500 |
| commit | a08afb0b0166cab961982f174a5cf672393b5198 (patch) | |
| tree | 6969d4fb69fe2e55775cc6a2e59ea31063d84102 /gr-blocks/include/blocks/CMakeLists.txt | |
| parent | 2e9de83a929192a65b827b964bd4452c20ef8756 (diff) | |
| parent | 9cfd03bd98693e62c6898f18d90d5d08f4d5c102 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-blocks/grc/blocks_block_tree.xml
Diffstat (limited to 'gr-blocks/include/blocks/CMakeLists.txt')
| -rw-r--r-- | gr-blocks/include/blocks/CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/blocks/CMakeLists.txt index ce493e64de..0da7a0e569 100644 --- a/gr-blocks/include/blocks/CMakeLists.txt +++ b/gr-blocks/include/blocks/CMakeLists.txt @@ -73,12 +73,14 @@ expand_h(argmax_XX fs is ss) expand_h(divide_XX ss ii ff cc) expand_h(integrate_XX ss ii ff cc) expand_h(max_XX ff ii ss) +expand_h(moving_average_XX ss ii ff cc) expand_h(multiply_XX ss ii) expand_h(multiply_const_XX ss ii) expand_h(multiply_const_vXX ss ii ff cc) expand_h(mute_XX ss ii ff cc) expand_h(not_XX bb ss ii) expand_h(or_XX bb ss ii) +expand_h(peak_detector_XX fb ib sb) expand_h(probe_signal_X b s i f c) expand_h(probe_signal_vX b s i f c) expand_h(sample_and_hold_XX bb ss ii ff) @@ -125,6 +127,11 @@ install(FILES interleaved_short_to_complex.h keep_m_in_n.h keep_one_in_n.h + message_debug.h + message_sink.h + message_source.h + message_strobe.h + message_burst_source.h multiply_cc.h multiply_ff.h multiply_conjugate_cc.h |