Merge remote-tracking branch 'origin/develop' into develop-SRS
# Conflicts: # openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c # openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c # openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
Showing
Please register or sign in to comment