Cedric Roux 74d07a70f6 Merge branch 'enhancement-192-beamforming' into develop_integration_w03 ...

Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/MODULATION/beamforming.c
	openair1/PHY/defs.h
	targets/RT/USER/lte-enb.c

2017-01-20 16:58:29 +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 'enhancement-192-beamforming' into develop_integration_w03

2017-01-20 16:58:29 +01:00

LTE_ESTIMATION

Merge branch 'enhancement-192-beamforming' into develop_integration_w03

2017-01-20 16:58:29 +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 branch 'enhancement-10-harmony' into develop_integration_w03

2017-01-20 16:49:39 +01:00

MODULATION

Merge branch 'enhancement-192-beamforming' into develop_integration_w03

2017-01-20 16:58:29 +01:00

TOOLS

adding multadd_cpx_vector

2017-01-18 09:33:39 +01:00

defs.h

Merge branch 'enhancement-10-harmony' into develop_integration_w03

2017-01-20 16:49:39 +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 'enhancement-192-beamforming' into develop_integration_w03

2017-01-20 16:58:29 +01:00

impl_defs_top.h

reduced the max number of antenna ports to 6 to save memory (we are not using antenna port >5 anyway)

2017-01-18 09:15:57 +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