Cedric Roux 2f639e45b6 Merge remote-tracking branch 'origin/ulSNRs' into develop ...

Conflicts:
	openair2/ENB_APP/MACRLC_paramdef.h
	openair2/LAYER2/MAC/mac.h

2018-06-18 16:01:25 +02:00

..

COMMON

Merge remote-tracking branch 'origin/develop' into mu_with_tdd1

2018-06-12 16:23:36 +02:00

DOCS

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00

ENB_APP

Merge remote-tracking branch 'origin/ulSNRs' into develop

2018-06-18 16:01:25 +02:00

LAYER2

Merge remote-tracking branch 'origin/ulSNRs' into develop

2018-06-18 16:01:25 +02:00

NETWORK_DRIVER

fix: let ue_ip.ko compile

2018-05-15 17:43:35 +02:00

PHY_INTERFACE

Merge remote-tracking branch 'origin/develop' into mu_with_tdd1

2018-06-12 16:23:36 +02:00

RRC

Merge remote-tracking branch 'origin/develop' into mu_with_tdd1

2018-06-12 16:23:36 +02:00

UTIL

Merge remote-tracking branch 'origin/develop' into mu_with_tdd1

2018-06-12 16:23:36 +02:00

X2AP

Merge branch 'develop' into feature-merge-f68

2018-02-08 18:05:28 +01:00