gabrielC 2dc9dc0316 Merge remote-tracking branch 'origin/tm4-fixes' into develop_integration_w07 ...

Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/LTE_TRANSPORT/power_control.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	targets/SIMU/USER/oaisim_functions.c

2017-02-14 15:25:37 +01:00

..

CODING

fix incorrect PUCCH format causing no SR received by eNB in TDD

2017-01-06 12:01:05 +08:00

INIT

Merge branch 'develop' into feature-59-tm4

2017-02-09 18:03:16 +01:00

LTE_ESTIMATION

Merge branch 'develop' into feature-59-tm4

2017-02-09 18:03:16 +01:00

LTE_REFSIG

Merge remote-tracking branch 'origin/develop' into feature-21-TM7

2016-11-18 15:35:21 +01:00

LTE_TRANSPORT

Merge remote-tracking branch 'origin/tm4-fixes' into develop_integration_w07

2017-02-14 15:25:37 +01:00

MODULATION

Revert "Merge remote-tracking branch 'origin/calib-LimeSDR' into develop_integration_w06"

2017-02-10 17:32:26 +01:00

TOOLS

Merge branch 'develop' into feature-59-tm4

2017-02-09 18:03:16 +01:00

defs.h

Merge remote-tracking branch 'origin/tm4-fixes' into develop_integration_w07

2017-02-14 15:25:37 +01:00

extern.h

Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop1B

2016-10-24 16:21:05 +02:00

impl_defs_lte.h

Merge branch 'develop' into feature-59-tm4

2017-02-09 18:03:16 +01:00

impl_defs_top.h

Merge branch 'develop' into feature-59-tm4

2017-01-30 13:37:24 +01:00

Makefile.inc

small fix in old Makefiles

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

sse_intrin.h

add licensing info at top of source files

2016-09-27 16:54:39 +02:00

types.h

add licensing info at top of source files

2016-09-27 16:54:39 +02:00

vars.h

merge from develop

2016-10-11 18:52:14 +02:00