Merge remote-tracking branch 'origin/develop-nr' into fix-clock-source

This commit is contained in:
Florian Kaltenberger
2019-12-13 16:42:04 +01:00
145 changed files with 7949 additions and 2021 deletions
+1 -1
View File
@@ -664,7 +664,7 @@ int main( int argc, char **argv ) {
logInit();
// get options and fill parameters from configuration file
get_options (); //Command-line options, enb_properties
//get_common_options();
get_common_options();
#if T_TRACER
T_Config_Init();
#endif