From f968b36d4ed2b194111585605f9a1b5367638fb3 Mon Sep 17 00:00:00 2001 From: Martin Braun <martin.braun@kit.edu> Date: Fri, 15 Mar 2013 02:12:20 -0700 Subject: Squash/rebased martin/ofdm-master onto trial merge branch Conflicts: gr-blocks/include/blocks/CMakeLists.txt --- gr-blocks/include/blocks/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gr-blocks/include/blocks/CMakeLists.txt') diff --git a/gr-blocks/include/blocks/CMakeLists.txt b/gr-blocks/include/blocks/CMakeLists.txt index c7b3cb918e..10e132ed92 100644 --- a/gr-blocks/include/blocks/CMakeLists.txt +++ b/gr-blocks/include/blocks/CMakeLists.txt @@ -155,6 +155,7 @@ install(FILES peak_detector2_fb.h probe_rate.h regenerate_bb.h + repack_bits_bb.h repeat.h rms_cf.h rms_ff.h @@ -174,6 +175,7 @@ install(FILES throttle.h transcendental.h tuntap_pdu.h + tagged_stream_mux.h uchar_to_float.h udp_sink.h udp_source.h -- cgit v1.2.3