merging develop with develop-nr

This commit is contained in:
Florian Kaltenberger
2018-10-25 03:15:09 -07:00
1300 changed files with 990656 additions and 1481 deletions
-1
View File
@@ -52,7 +52,6 @@ This header file must be included */
// #include "UTIL/LOG/log_extern.h"
//#include "PHY/defs.h"
//#include "PHY/extern.h"
#include "PHY/impl_defs_lte.h"
#endif
#define PACKET_MAC_LTE_DEFAULT_UDP_PORT (9999)