Merge branch 'develop' into parallel-phy-test-EMUFH
Conflicts: openair1/PHY/defs_eNB.h targets/RT/USER/lte-enb.c
Showing
- ci-scripts/Jenkinsfile-gitlab 74 additions, 0 deletionsci-scripts/Jenkinsfile-gitlab
- ci-scripts/astyle-options.txt 20 additions, 0 deletionsci-scripts/astyle-options.txt
- ci-scripts/checkCodingFormattingRules.sh 51 additions, 0 deletionsci-scripts/checkCodingFormattingRules.sh
- ci-scripts/doGitLabMerge.sh 27 additions, 0 deletionsci-scripts/doGitLabMerge.sh
- cmake_targets/CMakeLists.txt 208 additions, 259 deletionscmake_targets/CMakeLists.txt
- cmake_targets/build_oai 124 additions, 0 deletionscmake_targets/build_oai
- cmake_targets/lte-simulators/CMakeLists.txt 1 addition, 1 deletioncmake_targets/lte-simulators/CMakeLists.txt
- cmake_targets/tools/build_helper 11 additions, 7 deletionscmake_targets/tools/build_helper
- common/ran_context.h 3 additions, 3 deletionscommon/ran_context.h
- common/utils/T/T.c 11 additions, 7 deletionscommon/utils/T/T.c
- common/utils/T/T.h 11 additions, 0 deletionscommon/utils/T/T.h
- common/utils/T/T_defs.h 12 additions, 2 deletionscommon/utils/T/T_defs.h
- common/utils/T/local_tracer.c 22 additions, 8 deletionscommon/utils/T/local_tracer.c
- common/utils/T/tracer/enb.c 3 additions, 3 deletionscommon/utils/T/tracer/enb.c
- common/utils/T/tracer/event.c 11 additions, 5 deletionscommon/utils/T/tracer/event.c
- common/utils/T/tracer/event.h 2 additions, 1 deletioncommon/utils/T/tracer/event.h
- common/utils/T/tracer/extract.c 3 additions, 2 deletionscommon/utils/T/tracer/extract.c
- common/utils/T/tracer/extract_config.c 10 additions, 1 deletioncommon/utils/T/tracer/extract_config.c
- common/utils/T/tracer/extract_input_subframe.c 3 additions, 2 deletionscommon/utils/T/tracer/extract_input_subframe.c
- common/utils/T/tracer/extract_output_subframe.c 4 additions, 2 deletionscommon/utils/T/tracer/extract_output_subframe.c
Loading
Please register or sign in to comment