Cedric Roux e6f3c9b899 Merge branch 'enhancement-10-harmony' into develop_integration_w03 ...

Conflicts:
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c

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

..

COMMON

fix duplicated definition of boolean_t

2017-01-12 09:27:22 +01:00

DOCS

delete files with GPL License + modify build scripts

2016-10-07 18:19:43 +02:00

ENB_APP

fix LOG_X macros

2017-01-11 15:48:00 +01:00

LAYER2

Merge branch 'enhancement-10-harmony' into develop_integration_w03

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

NAS

add licensing info at top of source files

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

NETWORK_DRIVER

[OAI-UE] merge com4Innov branch to integration branch

2016-12-08 11:07:38 +01:00

PHY_INTERFACE

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

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

RRC

Merge branch 'bugfix-183-LOG_X-format' into develop_integration_w02

2017-01-13 17:16:16 +01:00

UTIL

Merge branch 'enhancement-10-harmony' into develop_integration_w03

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

X2AP

merge from develop

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

Makefile

update licensing information in remaining files

2016-09-28 11:17:33 +02:00