openair2/LAYER2/NR_MAC_gNB/mac_proto.h · 9112ee01f573ceceaab983116550f891579967dd · canghaiwuhen / OpenXG-RAN

Merge remote-tracking branch 'origin/develop' into nr_pucch · dcf7678f

Raymond Knopp authored Apr 07, 2020

Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h

dcf7678f

mac_proto.h 9.62 KB

Replace mac_proto.h