Shweta Shrivastava 1cfb528374 Resolve merge conflicts

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

..

nr_compute_tbs_common.c

Merge remote-tracking branch 'origin/ulsch_decode_mthread' into integration_2020_wk40

2020-10-06 11:00:09 +02:00

nr_mac_common.c

Resolve merge conflicts

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

nr_mac_common.h

Resolve merge conflicts

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

nr_mac_extern.h

Single definition and declaration of nr_slots_per_frame

2020-12-04 11:07:18 +01:00

nr_mac.h

dci size for 0_1 and some other modifications

2020-07-08 18:44:34 +02:00