diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-23 16:12:01 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-23 16:12:01 -0700 |
| commit | d178d9f30d4ea29f24d3021ee930fd031279619a (patch) | |
| tree | ee5dc602f0cdca26ca94f652daea976bc3dd793a | |
| parent | 09d8b895447b1507b80a27053b51361ea1684175 (diff) | |
| parent | d56f675a9911e0b31a8284a418ddb451b99f8ae5 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-atsc/include/gnuradio/atsc/CMakeLists.txt
| -rw-r--r-- | gr-fec/include/gnuradio/fec/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/gr-fec/include/gnuradio/fec/CMakeLists.txt b/gr-fec/include/gnuradio/fec/CMakeLists.txt index aca8c8da84..57594b47d8 100644 --- a/gr-fec/include/gnuradio/fec/CMakeLists.txt +++ b/gr-fec/include/gnuradio/fec/CMakeLists.txt @@ -47,6 +47,11 @@ install(FILES puncture_bb.h puncture_ff.h depuncture_bb.h + cldpc.h + alist.h + gf2mat.h + gf2vec.h + awgn_bp.h ldpc_encoder.h ldpc_decoder.h polar_encoder.h diff --git a/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt b/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt index 5d22f112af..991c7583a8 100644 --- a/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt +++ b/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt @@ -46,8 +46,6 @@ install(FILES qtgui_types.h sink_c.h sink_f.h - spectrumdisplayform.h - SpectrumGUIClass.h spectrumUpdateEvents.h timedisplayform.h timecontrolpanel.h diff --git a/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt b/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt index 1ad2f711fc..60f75e7913 100644 --- a/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt +++ b/gr-vocoder/include/gnuradio/vocoder/CMakeLists.txt @@ -24,9 +24,6 @@ install(FILES api.h alaw_decode_bs.h alaw_encode_sb.h - codec2.h - codec2_decode_ps.h - codec2_encode_sp.h cvsd_decode_bs.h cvsd_encode_sb.h g721_decode_bs.h |