maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
cb8b6db577e8a9ab222d63c5758907610688eb3c
openairinterface5g/openair2/PHY_INTERFACE
T
History
Raymond Knopp 1fc396f57d Merge after bad rebase 
Merge branch 'bugfix-48-L1L2signaling' of https://gitlab.eurecom.fr/oai/openairinterface5g into bugfix-48-L1L2signaling

Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
	openair1/SCHED/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_bch.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	openair2/LAYER2/MAC/proto.h
	openair2/PHY_INTERFACE/defs.h
2015-11-29 01:06:14 -08:00
..
COPYING
* Update license and header files
2014-07-22 13:43:51 +00:00
defs.h
Merge after bad rebase
2015-11-29 01:06:14 -08:00
extern.h
SVN to GIT migration (removed EPC software, updated mailing list address in all files)
2015-10-06 16:24:54 +00:00
mac_phy_primitives.c
SVN to GIT migration (removed EPC software, updated mailing list address in all files)
2015-10-06 16:24:54 +00:00
mac_phy_primitives.h
SVN to GIT migration (removed EPC software, updated mailing list address in all files)
2015-10-06 16:24:54 +00:00
vars.h
SVN to GIT migration (removed EPC software, updated mailing list address in all files)
2015-10-06 16:24:54 +00:00