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

Merge remote-tracking branch 'origin/issue326_LOGreview' into develop_integration_2018_w35

Browse Source 
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/eNB_scheduler_phytest.c
This commit is contained in:
Cedric Roux
2018-08-31 12:55:28 +02:00
parent 7654f8a208 9399dd9735
commit c22180ff31
71 changed files with 1709 additions and 2377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/X2AP/x2ap_common.h
-1
View File
@@ -57,7 +57,6 @@
#define FALSE 0
#endif
extern int asn_debug;
extern int asn1_xer_print;
#if defined(ENB_MODE)