Commit Graph
5 Commits
Author SHA1 Message Date
Raymond Knopp e4f82c5e95 Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split
Conflicts:
	openair1/PHY/LTE_TRANSPORT/edci.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
2017-11-05 05:26:01 -08:00
Raymond Knopp 322f8cbb66 Merge branch 'RU-RAU-split' of http://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split 2017-08-17 16:25:27 +02:00
Raymond Knopp c1fff42782 Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split
Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
2017-08-10 17:27:07 -07:00
Raymond Knopp 6aa0ff090b Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split 2017-08-07 23:31:13 -07:00
Raymond Knopp 05573ced20 Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/raymond.knopp/openairinterface5g into RU-RAU-split
Conflicts:
	openair2/ENB_APP/enb_config.c
	openair2/RRC/LITE/MESSAGES/asn1_msg.c
	openair2/RRC/LITE/MESSAGES/asn1_msg.h
2017-07-26 17:13:30 -07:00