Cedric Roux e05bf365be Merge branch 'bugfix-177' into develop_integration_wk01 ...

Smoe conflicts, manually resolved.

Conflicts:
	openair1/SCHED/phy_procedures_lte_ue.c

2017-01-06 11:12:06 +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 remote-tracking branch 'origin/feature-21-TM7-tmp' into develop_integration_w50

2016-12-15 11:39:04 +01:00

LTE_ESTIMATION

Merge branch 'bugfix-177' into develop_integration_wk01

2017-01-06 11:12:06 +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 'bugfix-177' into develop_integration_wk01

2017-01-06 11:12:06 +01:00

MODULATION

delete redundant code in beamforming.c

2016-11-24 17:57:52 +01:00

TOOLS

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

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

defs.h

Merge branch 'bugfix-164' into develop_integration_wk01

2017-01-06 10:52:35 +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 'bugfix-176' into develop_integration_wk01

2017-01-06 11:04:39 +01:00

impl_defs_top.h

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

2016-11-18 15:35:21 +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