-
Florian Kaltenberger authored
Conflicts: cmake_targets/CMakeLists.txt openair1/PHY/MODULATION/ofdm_mod.c openair1/PHY/TOOLS/lte_dfts.c
1d7728b4
Conflicts: cmake_targets/CMakeLists.txt openair1/PHY/MODULATION/ofdm_mod.c openair1/PHY/TOOLS/lte_dfts.c