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

4aec4a23

Commit 4aec4a23 authored 6 years ago by Cédric Roux

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/multi-sdr-ip-conf' into develop_integration_2018_w35

parents 27322602 be0e4095

No related branches found

No related tags found

3 merge requests!433Merging develop into develop-nr,!430Develop nr merge2,!378Develop integration 2018 w35

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

openair2/ENB_APP/enb_paramdef.h 6 additions, 0 deletions

openair2/ENB_APP/enb_paramdef.h
targets/ARCH/COMMON/common_lib.h 2 additions, 0 deletions

targets/ARCH/COMMON/common_lib.h
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp 51 additions, 18 deletions

targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
targets/RT/USER/lte-ru.c 18 additions, 0 deletions

targets/RT/USER/lte-ru.c

with 77 additions and 18 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