summaryrefslogtreecommitdiff
path: root/gr-digital/include/digital_ofdm_sampler.h
AgeCommit message (Collapse)Author
2011-10-17Merge branch 'next' of http://gnuradio.org/git/gnuradio into nextJosh Blum
Conflicts: gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h gnuradio-core/src/lib/general/gr_ofdm_demapper_vcb.h gr-digital/include/digital_ofdm_cyclic_prefixer.h gr-digital/include/digital_ofdm_frame_acquisition.h gr-digital/include/digital_ofdm_frame_sink.h gr-digital/include/digital_ofdm_insert_preamble.h gr-digital/include/digital_ofdm_mapper_bcv.h gr-digital/include/digital_ofdm_sampler.h
2011-10-12digital: moved over all c++ blocks to gr-digital. Benchmark tx/rx still working.Tom Rondeau