-
Cedric Roux authored
Conflicts: openair1/PHY/CODING/rate_matching.c openair1/PHY/LTE_REFSIG/primary_synch.h openair2/LAYER2/layer2_top.c openair2/RRC/LITE/rrc_config.c
e0a3e74c
Conflicts: openair1/PHY/CODING/rate_matching.c openair1/PHY/LTE_REFSIG/primary_synch.h openair2/LAYER2/layer2_top.c openair2/RRC/LITE/rrc_config.c