diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-13 18:02:42 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-13 18:02:42 -0400 |
| commit | 1c9d67fc220737873728310bd679d9e9cfab470a (patch) | |
| tree | 5fbf8c157da3e938d9b90ebe720f3efbcef39215 /gr-blocks/include/blocks/CMakeLists.txt | |
| parent | 1d8d1f111c41862d877686a89344a4a74f146cee (diff) | |
| parent | 1bacc04f7a8f2f9c868a9934624683c7cefb2300 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-audio/lib/CMakeLists.txt
gr-blocks/include/blocks/CMakeLists.txt
gr-blocks/include/blocks/socket_pdu.h
gr-blocks/lib/CMakeLists.txt
gr-blocks/swig/blocks_swig.i
gr-comedi/src/CMakeLists.txt
gr-howto-write-a-block/lib/CMakeLists.txt
gr-noaa/lib/CMakeLists.txt
gr-qtgui/lib/CMakeLists.txt
gr-uhd/lib/CMakeLists.txt
gr-vocoder/lib/CMakeLists.txt
gr-wavelet/lib/CMakeLists.txt
Diffstat (limited to 'gr-blocks/include/blocks/CMakeLists.txt')
| -rw-r--r-- | gr-blocks/include/blocks/CMakeLists.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/blocks/CMakeLists.txt index 648adccdbb..82d4179c72 100644 --- a/gr-blocks/include/blocks/CMakeLists.txt +++ b/gr-blocks/include/blocks/CMakeLists.txt @@ -124,9 +124,6 @@ install(FILES conjugate_cc.h deinterleave.h delay.h - file_descriptor_sink.h - file_descriptor_source.h - file_sink.h file_source.h file_meta_sink.h file_meta_source.h @@ -157,6 +154,7 @@ install(FILES pdu_to_tagged_stream.h peak_detector2_fb.h random_pdu.h + probe_rate.h regenerate_bb.h repeat.h rms_cf.h |