-
Raymond Knopp authored
Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony Conflicts: openair1/PHY/defs.h targets/RT/USER/lte-enb.c targets/RT/USER/lte-softmodem.c
e6fe9013
Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony Conflicts: openair1/PHY/defs.h targets/RT/USER/lte-enb.c targets/RT/USER/lte-softmodem.c