Raymond Knopp
|
1ca00e40b5
|
Merge remote-tracking branch 'origin/develop-nr' into shortBlockCoding
Conflicts:
cmake_targets/CMakeLists.txt
cmake_targets/autotests/test_case_list.xml
cmake_targets/build_oai
openair1/PHY/CODING/TESTBENCH/polartest.c
openair1/PHY/CODING/nrPolar_tools/nr_polar_decoder.c
openair1/PHY/CODING/nrPolar_tools/nr_polar_decoding_tools.c
openair1/PHY/CODING/nrPolar_tools/nr_polar_defs.h
openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
openair1/PHY/CODING/nr_polar_init.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
openair1/SIMULATION/NR_PHY/dlschsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
|
2019-04-04 09:14:37 +02:00 |
|