Raymond Knopp 47e0d056be Merge branch 'NR_RRCConfiguration' into NR_RRC_PRACH_procedures ...

Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_dci.c
	openair1/PHY/NR_TRANSPORT/nr_prach.c
	openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
	openair1/PHY/defs_nr_common.h
	openair1/SIMULATION/NR_PHY/nr_unitary_defs.h
	openair1/SIMULATION/NR_PHY/prachsim.c
	openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

2020-03-09 21:14:32 +01:00

..

at_commands

Merge remote-tracking branch 'origin/develop' into enhancement-ltem

2019-01-19 12:14:23 +01:00

autotests

fix for test_case_list.xml file w.r.t. nr_dlsim tests. Still a few tests failing, but .xml syntax errors are fixed

2020-02-27 17:09:24 +01:00

doxygen

fix a lot of file mode

2019-01-07 16:22:28 +01:00

epc_test

bugfix: fix PDCP sequence management (plus some cleanup)

2019-02-27 12:33:04 +01:00

nas_sim_tools

fix a lot of file mode

2019-01-07 16:22:28 +01:00

phy_simulators

Merge branch 'develop' into develop-nr

2019-05-17 17:11:31 +02:00

s1c_mme_test

bugfix: fix PDCP sequence management (plus some cleanup)

2019-02-27 12:33:04 +01:00

tools

Merge branch 'fhg-ta' into fhg-ra

2020-02-03 10:45:29 +01:00

build_oai

Merge branch 'fhg-ta' into fhg-ra

2020-02-03 10:45:29 +01:00

CMakeLists.txt

Merge branch 'NR_RRCConfiguration' into NR_RRC_PRACH_procedures

2020-03-09 21:14:32 +01:00

snap_environment.sh

Issue #211 - enhance build script for snapping package

2017-02-17 13:56:00 +01:00