diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-18 17:38:06 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-18 17:38:06 -0400 |
| commit | 04682315bf151fb2c7c24673676cd8e07ab5fe2e (patch) | |
| tree | bfa4a5157719b134adc5f6f3783f790220ae2f6b /gr-digital/lib/CMakeLists.txt | |
| parent | 78527080d5cfcc611646d4694ecb9a026b343652 (diff) | |
| parent | 3206f12930a131914ca2c0d15969c54d8dee5775 (diff) | |
Merge branch 'next' of gnuradio.org:gnuradio into next
Conflicts:
gr-digital/examples/ofdm/ofdm_bugsquatch.py
gr-digital/include/digital/scale_tags.h
gr-digital/include/digital/tagged_stream_check.h
gr-digital/include/digital/ts_insert_zeros_cc.h
gr-digital/python/qa_ofdm_sync_sc_cfb.py
gr-digital/python/qa_scale_tags.py
gr-digital/python/qa_ts_insert_zeros.py
gr-digital/swig/digital_swig.i
Diffstat (limited to 'gr-digital/lib/CMakeLists.txt')
| -rw-r--r-- | gr-digital/lib/CMakeLists.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt index 7e83b86021..d0a9132250 100644 --- a/gr-digital/lib/CMakeLists.txt +++ b/gr-digital/lib/CMakeLists.txt @@ -167,12 +167,10 @@ list(APPEND digital_sources pn_correlator_cc_impl.cc probe_density_b_impl.cc probe_mpsk_snr_est_c_impl.cc - scale_tags_impl.cc scrambler_bb_impl.cc simple_correlator_impl.cc simple_framer_impl.cc - tagged_stream_check_impl.cc - ts_insert_zeros_cc_impl.cc + header_payload_demux_impl.cc ) #Add Windows DLL resource file if using MSVC |