Wang Tsu-Han e4a7318877 Merge branch 'develop' into parallel-phy-test-EMUFH ...

Conflicts:
	openair1/PHY/defs_eNB.h
	targets/RT/USER/lte-enb.c

2018-06-12 16:18:45 +02:00

..

COMMON

Merge remote-tracking branch 'origin/feature-better-sw-configuration-between-various-version' into develop_integration_2018_w19

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

DOCS

upgrade license to version 1.1

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

ENB_APP

Merge branch 'develop' into parallel-phy-test-EMUFH

2018-06-12 16:18:45 +02:00

LAYER2

Merge branch 'develop' into parallel-phy-test-EMUFH

2018-06-12 16:18:45 +02:00

NETWORK_DRIVER

fix: let ue_ip.ko compile

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

PHY_INTERFACE

integration fix: remove warnings

2018-05-28 12:44:14 +02:00

RRC

integration fix: remove warnings

2018-05-24 17:15:42 +02:00

UTIL

Merge remote-tracking branch 'origin/fix-rdtsc' into develop_integration_2018_w19

2018-05-15 15:30:53 +02:00

X2AP

Merge branch 'develop' into feature-merge-f68

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