Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into mac-indentation-fix
Conflicts: openair2/LAYER2/MAC/config.c openair2/LAYER2/MAC/eNB_scheduler.c openair2/LAYER2/MAC/eNB_scheduler_primitives.c
No related branches found
No related tags found
Showing
- cmake_targets/CMakeLists.txt 194 additions, 109 deletionscmake_targets/CMakeLists.txt
- cmake_targets/build_oai 3 additions, 52 deletionscmake_targets/build_oai
- cmake_targets/epc_test/CMakeLists.template 0 additions, 19 deletionscmake_targets/epc_test/CMakeLists.template
- cmake_targets/lte-simulators/CMakeLists.txt 0 additions, 3 deletionscmake_targets/lte-simulators/CMakeLists.txt
- cmake_targets/oaisim_build_oai/CMakeLists.template 0 additions, 20 deletionscmake_targets/oaisim_build_oai/CMakeLists.template
- cmake_targets/oaisim_mme_build_oai/CMakeLists.template 0 additions, 21 deletionscmake_targets/oaisim_mme_build_oai/CMakeLists.template
- cmake_targets/oaisim_noS1_build_oai/CMakeLists.template 1 addition, 22 deletionscmake_targets/oaisim_noS1_build_oai/CMakeLists.template
- cmake_targets/s1c_mme_test/CMakeLists.template 0 additions, 20 deletionscmake_targets/s1c_mme_test/CMakeLists.template
- cmake_targets/tools/init_nas_nos1 2 additions, 2 deletionscmake_targets/tools/init_nas_nos1
- common/utils/T/T_messages.txt 4 additions, 0 deletionscommon/utils/T/T_messages.txt
- common/utils/itti/intertask_interface.c 1 addition, 232 deletionscommon/utils/itti/intertask_interface.c
- common/utils/itti/intertask_interface.h 0 additions, 6 deletionscommon/utils/itti/intertask_interface.h
- common/utils/itti/intertask_interface_dump.c 0 additions, 85 deletionscommon/utils/itti/intertask_interface_dump.c
- common/utils/itti/itti_types.h 0 additions, 4 deletionscommon/utils/itti/itti_types.h
- common/utils/itti/memory_pools.c 0 additions, 37 deletionscommon/utils/itti/memory_pools.c
- common/utils/telnetsrv/CMakeLists.txt 1 addition, 1 deletioncommon/utils/telnetsrv/CMakeLists.txt
- nfapi/open-nFAPI/nfapi/src/nfapi_p4.c 1 addition, 0 deletionsnfapi/open-nFAPI/nfapi/src/nfapi_p4.c
- nfapi/open-nFAPI/nfapi/src/nfapi_p5.c 1 addition, 0 deletionsnfapi/open-nFAPI/nfapi/src/nfapi_p5.c
- nfapi/open-nFAPI/nfapi/src/nfapi_p7.c 1 addition, 0 deletionsnfapi/open-nFAPI/nfapi/src/nfapi_p7.c
- openair1/Makefile 0 additions, 121 deletionsopenair1/Makefile
Loading
Please register or sign in to comment