Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR

Conflicts: openair2/RRC/NR/MESSAGES/asn1_msg.h
2022-03-07 07:38:03 +01:00
parent fcd88de2ab a981291ba8
commit 2bd90d5b49
106 changed files with 493 additions and 21585 deletions
@@ -62,8 +62,6 @@ unsigned short config_frames[4] = {2,9,11,13};
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "UTIL/OPT/opt.h"

-//#include "PHY/TOOLS/time_meas.h"
-
 #include "intertask_interface.h"

 #include "PHY/INIT/phy_init.h"