Skip to content

O
OpenXG-RAN
Switch branch/tag
Find file BlameHistoryPermalink
  • Cedric Roux's avatar
    Merge remote-tracking branch 'origin/develop' into x2 · 246abce5
    Cedric Roux authored 
     Conflicts:
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.h
	openair2/RRC/LTE/rrc_defs.h
	openair2/RRC/LTE/rrc_eNB.c
	openair2/RRC/LTE/rrc_eNB_S1AP.c
	openair2/RRC/LTE/rrc_proto.h
	openair3/GTPV1-U/gtpv1u_eNB.c
	openair3/S1AP/s1ap_eNB_handlers.c
    246abce5
eNB_scheduler_ulsch.c 72.8 KB