Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openairinterface5G
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
oai
openairinterface5G
Commits
4c069754
Commit
4c069754
authored
6 years ago
by
Cédric Roux
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/basic-simulator-fixes' into develop_integration_2018_w35
parents
c22180ff
a48c3658
No related branches found
No related tags found
3 merge requests
!433
Merging develop into develop-nr
,
!430
Develop nr merge2
,
!378
Develop integration 2018 w35
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
openair1/PHY/LTE_TRANSPORT/dci.c
+8
-0
8 additions, 0 deletions
openair1/PHY/LTE_TRANSPORT/dci.c
targets/ARCH/tcp_bridge/tcp_bridge_oai.c
+1
-1
1 addition, 1 deletion
targets/ARCH/tcp_bridge/tcp_bridge_oai.c
targets/RT/USER/lte-ue.c
+15
-19
15 additions, 19 deletions
targets/RT/USER/lte-ue.c
with
24 additions
and
20 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
