diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-18 17:41:12 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-18 17:41:12 -0400 |
| commit | 644459b0c55987792df3a7b884ace1d0250231f1 (patch) | |
| tree | ded5c662890dbccd28b8400aecfa5933600f9520 /gr-blocks/include/blocks/CMakeLists.txt | |
| parent | 04682315bf151fb2c7c24673676cd8e07ab5fe2e (diff) | |
| parent | e0236f2bf8eb4a069736d69808432348140e576f (diff) | |
Merge branch 'master' into next
Conflicts:
gr-blocks/include/blocks/CMakeLists.txt
gr-blocks/lib/CMakeLists.txt
gr-blocks/swig/blocks_swig.i
gr-digital/lib/digital_ofdm_sync_sc_cfb.cc
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 a88eaeeb26..edad5ef526 100644 --- a/gr-blocks/include/blocks/CMakeLists.txt +++ b/gr-blocks/include/blocks/CMakeLists.txt @@ -165,6 +165,7 @@ install(FILES pdu_to_tagged_stream.h peak_detector2_fb.h random_pdu.h + plateau_detector_fb.h probe_rate.h regenerate_bb.h repack_bits_bb.h |