Thomas Schlichter 225a500b3e Merge branch 'develop' into NR_RRC_PRACH_procedures ...

Conflicts:
	executables/nr-ue.c
	openair1/PHY/NR_REFSIG/dmrs_nr.c
	openair1/PHY/NR_TRANSPORT/nr_prach.c
	openair1/PHY/NR_TRANSPORT/nr_transport_common_proto.h
	openair1/PHY/NR_TRANSPORT/nr_transport_proto_common.h
	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
	openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
	openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
	openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
	openair1/SIMULATION/NR_PHY/prachsim.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	openair2/LAYER2/NR_MAC_COMMON/nr_mac_extern.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

2020-06-03 19:50:54 +02:00

..

at_commands

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

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

autotests

Merge branch 'develop' into NR_RRC_PRACH_procedures

2020-05-20 19:26:16 +02: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

include dir

2020-04-28 16:33:50 +02:00

phy_simulators

big merge with develop

2020-04-14 18:02:45 +02:00

s1c_mme_test

bugfix: fix PDCP sequence management (plus some cleanup)

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

tools

cleanup branch

2020-05-20 15:44:20 +02:00

build_oai

cleanup branch

2020-05-20 15:44:20 +02:00

CMakeLists.txt

Merge branch 'develop' into NR_RRC_PRACH_procedures

2020-06-03 19:50:54 +02:00

snap_environment.sh

Issue #211 - enhance build script for snapping package

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