Cedric Roux 2d6dd02b95 bugfix: fix bad conflict resolutions from previous commits ...

Some more fixes for some bad conflict resolutions.

I ran:

    git diff 2018.w04 2018.w05

And saw some problems with config_sib2.

There was also something strange in openair2/LAYER2/openair2_proc.c
in the function dump_eNB_l2_stats. Maybe the fix is wrong for
this one. To be checked.

2018-02-16 11:11:50 +01:00

..

COMMON

Niccolo: Add sorting policy

2018-02-14 17:06:04 +01:00

DOCS

upgrade license to version 1.1

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

ENB_APP

integration fix: compilation failed

2018-02-15 13:40:34 +01:00

LAYER2

bugfix: fix bad conflict resolutions from previous commits

2018-02-16 11:11:50 +01:00

NETWORK_DRIVER

integration fix: remove definition of OAI_NW_DRIVER_USE_NETLINK in source file

2018-02-12 16:15:09 +01:00

PHY_INTERFACE

Fix #582, merge from develop

2018-01-16 14:31:23 +01:00

RRC

integration fix: noS1 compilation

2018-02-15 11:34:53 +01:00

UTIL

Merge branch 'develop' into feature-merge-f68

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

X2AP

Merge branch 'develop' into feature-merge-f68

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