wu.jing c994c2ad8f Merge branch 'develop_SA_SIM' into develop_SA_L3 ...

Conflicts:
	common/utils/ocp_itti/intertask_interface.h
	openair2/COMMON/gtpv1_u_messages_types.h
	openair2/GNB_APP/gnb_config.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NAS/NR_UE/nr_nas_msg_sim.h
	openair3/NGAP/ngap_gNB_nas_procedures.c

2020-11-24 09:15:52 +00:00

..

COMMON

Merge branch 'develop_SA_SIM' into develop_SA_L3

2020-11-24 09:15:52 +00:00

DOCS

Fixing errored/missing circular dependency protection

2020-05-15 15:39:11 +02:00

ENB_APP

Merge remote-tracking branch 'origin/feature/make-s1-mme-port-configurable' into integration_2020_wk47

2020-11-17 13:53:10 +01:00

F1AP

Merge remote-tracking branch 'origin/develop' into fembms-enb-ue

2020-07-22 07:42:44 +02:00

GNB_APP

Merge branch 'develop_SA_SIM' into develop_SA_L3

2020-11-24 09:15:52 +00:00

LAYER2

Merge remote-tracking branch 'origin/nr_ue_tti_cleanup' into integration_2020_wk48

2020-11-19 18:42:30 +01:00

M2AP

fembms: code cleanup

2020-07-21 21:07:42 +02:00

MCE_APP

fembms: code cleanup

2020-07-21 21:07:42 +02:00

NETWORK_DRIVER

Merge remote-tracking branch 'origin/fixes-tun' into integration_2020_wk44

2020-10-26 17:28:11 +01:00

NR_PHY_INTERFACE

Merge remote-tracking branch 'origin/develop' into NR_CSI_reporting

2020-10-22 09:26:51 +02:00

NR_UE_PHY_INTERFACE

NR UE cleanup: remove current_thread_id array, nr_tti_rx, nr_tti_tx, subframe_rx and subframe_tx

2020-11-13 17:29:02 +01:00

PHY_INTERFACE

Remove Mutexes in phy_stub_UE.c

2020-10-13 08:49:30 +02:00

RRC

Merge branch 'develop_SA_SIM' into develop_SA_L3

2020-11-24 09:15:52 +00:00

SDAP/nr_sdap

Create asn1 file

2020-09-03 17:17:47 +09:00

SIMULATION/NR_RRC

Merge branch 'develop_SA_SIM' into develop_SA_L3

2020-11-24 09:15:52 +00:00

UTIL

Merge branch 'develop_SA_SIM' into develop_SA_L3

2020-11-24 09:15:52 +00:00

X2AP

Merge remote-tracking branch 'origin/nsa_remove_band_hardcodings' into integration_2020_wk39

2020-09-30 14:36:24 +02:00