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

..

CODING

Moved CCE allocations from PHY to MAC and updated MAC interfaces for BCCH/RA/UE-SPEC scheduling.

2015-11-24 14:35:20 -08:00

INIT

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

LTE_ESTIMATION

merged in changes from abeille (modifications on final svn version)

2015-11-24 14:35:20 -08:00

LTE_REFSIG

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

LTE_TRANSPORT

Merge after bad rebase

2015-11-29 01:06:14 -08:00

MODULATION

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

TOOLS

CCE Allocation in MAC, rebase from develop. Frame number limitation to 1024 for non-real time targets (caused bad bug in oaisim).

2015-11-25 13:49:40 -08:00

COPYING

License updated

2014-08-13 10:12:43 +00:00

defs.h

merged in changes from abeille (modifications on final svn version)

2015-11-24 14:35:20 -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

impl_defs_lte.h

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

impl_defs_top.h

CCE Allocation in MAC, rebase from develop. Frame number limitation to 1024 for non-real time targets (caused bad bug in oaisim).

2015-11-25 13:49:40 -08:00

Makefile.inc

small fix in old Makefiles

2015-09-03 13:59:03 +00:00

spec_defs_top.h

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

spec_defs.h

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

sse_intrin.h

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

types.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