gabrielC eadcba956e Merge branch 'develop-realtime-lts' into develop_integration_w07 ...

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

2017-02-17 11:51:03 +01:00

..

COMMON

Merge branch 'develop-realtime-lts' into develop_integration_w07

2017-02-17 11:51:03 +01:00

DOCS

delete files with GPL License + modify build scripts

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

ENB_APP

Merge remote-tracking branch 'origin/feature-68-enb-agent' into develop_integration_w06

2017-02-10 12:22:46 +01:00

LAYER2

Merge branch 'enhancement-199-nas-multi-ue' into develop_integration_w07

2017-02-16 12:14:26 +01:00

NAS

UE: move nas_ue_task.h from openair2 to openair3/NAS/UE

2017-01-25 13:06:13 +01:00

NETWORK_DRIVER

ue_ip: use correct instance

2017-02-14 10:58:06 +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

integration fix: remove XER_PRINT from RRC

2017-02-16 12:53:25 +01:00

UTIL

Merge branch 'develop-realtime-lts' into develop_integration_w07

2017-02-17 11:51:03 +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