maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into tx-proc-optim

Browse Source 
Conflicts:
	common/utils/nr/nr_common.h
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
This commit is contained in:
Raymond Knopp
2021-11-11 08:34:06 +01:00
parent 07d735f93c 6e5527e0c6
commit 95343c6658
184 changed files with 3912 additions and 4173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executables/nr-gnb.c
-4
View File
@@ -76,10 +76,6 @@
#include "gnb_paramdef.h"
#ifndef OPENAIR2
#include "UTIL/OTG/otg_extern.h"
#endif
#include "s1ap_eNB.h"
#include "SIMULATION/ETH_TRANSPORT/proto.h"
#include <executables/softmodem-common.h>