Shweta Shrivastava 1cfb528374 Resolve merge conflicts

2021-01-08 13:21:14 -06:00

..

MAC

Merge remote-tracking branch 'origin/develop-oriecpriupdates' into rh_wk50_debug

2020-12-09 14:16:19 +01:00

NR_MAC_COMMON

Resolve merge conflicts

2021-01-08 13:21:14 -06:00

NR_MAC_gNB

Use PTRS params from RRC at MAC; remove hardcoding

2021-01-08 11:19:29 -06:00

NR_MAC_UE

Resolve merge conflicts

2021-01-08 13:21:14 -06:00

nr_pdcp

Merge branch 'develop' into 'fix_do_ra_data'

2020-12-10 13:40:08 +01:00

nr_rlc

Merge branch 'develop' into 'fix_do_ra_data'

2020-12-10 13:40:08 +01:00

PDCP_v10.1.0

Remove hack in LTE PDCP for noS1 mode

2020-12-03 00:31:23 +01:00

PROTO_AGENT

LIC: wrong license banner on proto-agent files

2020-04-29 10:30:09 +02:00

RLC

Fix compilation issues

2020-10-06 13:54:30 +02:00

rlc_v2

Merge branch 'develop' into 'fix_do_ra_data'

2020-12-10 13:40:08 +01:00

openair2_proc.c

Rename UE_list_t to UE_info_t, UE_list_t separate struct

2020-04-01 10:47:02 +02:00