Merge remote-tracking branch 'remotes/origin/develop_SA_NGAP' into develop_SA_L3

Browse Source

# Conflicts:
#	openair2/GNB_APP/gnb_paramdef.h
#	openair3/NGAP/ngap_gNB_nas_procedures.c

...

This commit is contained in:

masayuki.harada

2020-10-15 15:39:46 +09:00

parent f00e5deb14 079157eb55

commit bdc83aaac6

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available