Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

openairinterface5G
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

b7762c6a

Commit b7762c6a authored 8 years ago by Cédric Roux

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/bugfix-220' into develop_integration_w13

parents 9af7f280 9814de05

No related branches found

No related tags found

1 merge request!168Develop integration w13

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

cmake_targets/build_oai 9 additions, 6 deletions

cmake_targets/build_oai
openair1/PHY/TOOLS/lte_phy_scope.c 6 additions, 3 deletions

openair1/PHY/TOOLS/lte_phy_scope.c
openair1/SCHED/phy_procedures_lte_eNb.c 1 addition, 1 deletion

openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SIMULATION/LTE_PHY/pdcchsim.c 1 addition, 0 deletions

openair1/SIMULATION/LTE_PHY/pdcchsim.c
openair2/LAYER2/MAC/ue_procedures.c 3 additions, 3 deletions

openair2/LAYER2/MAC/ue_procedures.c
openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.c 1 addition, 1 deletion

openair2/LAYER2/RLC/AM_v9.3.0/rlc_am_reassembly.c
openair2/UTIL/LOG/log.c 17 additions, 0 deletions

openair2/UTIL/LOG/log.c
targets/RT/USER/lte-softmodem.c 2 additions, 1 deletion

targets/RT/USER/lte-softmodem.c
targets/SIMU/USER/oaisim.c 1 addition, 1 deletion

targets/SIMU/USER/oaisim.c

with 41 additions and 16 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment