Merge remote-tracking branch 'origin/issue326_LOGreview' into develop_integration_2018_w35
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
Showing
- cmake_targets/CMakeLists.txt 6 additions, 11 deletionscmake_targets/CMakeLists.txt
- cmake_targets/build_oai 18 additions, 1 deletioncmake_targets/build_oai
- cmake_targets/nas_sim_tools/CMakeLists.txt 0 additions, 1 deletioncmake_targets/nas_sim_tools/CMakeLists.txt
- common/config/config_cmdline.c 3 additions, 3 deletionscommon/config/config_cmdline.c
- common/utils/LOG/log.c 138 additions, 101 deletionscommon/utils/LOG/log.c
- common/utils/LOG/log.h 90 additions, 54 deletionscommon/utils/LOG/log.h
- common/utils/T/T_messages.txt 21 additions, 0 deletionscommon/utils/T/T_messages.txt
- common/utils/itti/signals.c 1 addition, 1 deletioncommon/utils/itti/signals.c
- common/utils/itti/timer.c 1 addition, 1 deletioncommon/utils/itti/timer.c
- common/utils/load_module_shlib.c 4 additions, 4 deletionscommon/utils/load_module_shlib.c
- common/utils/load_module_shlib.h 9 additions, 8 deletionscommon/utils/load_module_shlib.h
- common/utils/msc/msc.c 24 additions, 7 deletionscommon/utils/msc/msc.c
- common/utils/msc/msc.h 29 additions, 18 deletionscommon/utils/msc/msc.h
- common/utils/telnetsrv/telnetsrv_proccmd.c 44 additions, 36 deletionscommon/utils/telnetsrv/telnetsrv_proccmd.c
- common/utils/telnetsrv/telnetsrv_proccmd.h 7 additions, 5 deletionscommon/utils/telnetsrv/telnetsrv_proccmd.h
- openair1/PHY/CODING/coding_load.c 1 addition, 1 deletionopenair1/PHY/CODING/coding_load.c
- openair1/PHY/INIT/lte_parms.c 1 addition, 1 deletionopenair1/PHY/INIT/lte_parms.c
- openair1/PHY/LTE_ESTIMATION/lte_sync_time.c 15 additions, 15 deletionsopenair1/PHY/LTE_ESTIMATION/lte_sync_time.c
- openair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c 1 addition, 1 deletionopenair1/PHY/LTE_ESTIMATION/lte_ue_measurements.c
- openair1/PHY/LTE_REFSIG/lte_dl_cell_spec.c 34 additions, 37 deletionsopenair1/PHY/LTE_REFSIG/lte_dl_cell_spec.c
Loading
Please register or sign in to comment