Raymond Knopp 44a225c6b7 Merge remote-tracking branch 'origin/develop' into enhancement-ltem ...

Conflicts:
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/COMMON/rrc_messages_types.h
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/LAYER2/MAC/mac.h
	openair2/RRC/LTE/L2_interface.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.c
	openair2/RRC/LTE/MESSAGES/asn1_msg.h
	openair2/RRC/LTE/rrc_eNB.c
	openair2/RRC/LTE/rrc_eNB_S1AP.c
	targets/RT/USER/lte-enb.c

2019-01-05 23:28:31 +01:00

..

CENTOS-LTE-EPC-INTEGRATION/CONF

Change remaining config files to plmn_list style

2018-09-28 17:40:37 +02:00

E-MBMS

Change remaining config files to plmn_list style

2018-09-28 17:40:37 +02:00

GENERIC-LTE-EPC

Merge remote-tracking branch 'origin/develop' into enhancement-ltem

2019-01-05 23:28:31 +01:00

LOCALIZATION

solving some errors

2017-08-14 11:04:50 +02:00

TDDREC

solving some errors

2017-08-14 11:04:50 +02:00