Raymond Knopp 219016e7a4 Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony ...

Conflicts:
	openair1/PHY/INIT/lte_init.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
	targets/SIMU/USER/init_lte.c

2017-01-04 07:18:52 +01:00

..

CODING

ue autotest merge part2

2016-12-14 10:16:54 +01:00

INIT

Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony

2017-01-04 07:18:52 +01:00

LTE_ESTIMATION

Merge remote-tracking branch 'origin/develop' into enhancement-10-harmony

2016-12-22 23:17:37 +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' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony

2017-01-04 07:18:52 +01:00

MODULATION

Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony

2017-01-04 07:18: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 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony

2017-01-04 07:18:52 +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 remote-tracking branch 'origin/feature-21-TM7-tmp' into develop_integration_w50

2016-12-15 11:39:04 +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