Cedric Roux b29f6bc7e5 Merge branch 'bugfix-178' into develop_integration_wk01 ...

Conflicts, manually resolved.

Conflicts:
	openair2/LAYER2/RLC/UM_v9.3.0/rlc_um_dar.c

2017-01-06 11:16:02 +01:00

..

COMMON

integration fix: attempt to clarify ODD_PARITY

2016-12-08 17:51:02 +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/develop' into feature-21-TM7-tmp

2016-12-07 09:40:20 +01:00

LAYER2

Merge branch 'bugfix-178' into develop_integration_wk01

2017-01-06 11:16:02 +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

fixing thread busy crash: disabled timing consuming NAS logs

2016-12-21 16:28:50 +08:00

UTIL

Merge branch 'bugfix-177' into develop_integration_wk01

2017-01-06 11:12:06 +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