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

fde6645f

Commit fde6645f authored Aug 17, 2017 by knopp

Downloads
- Plain Diff

Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split

Conflicts:
	openair1/PHY/LTE_TRANSPORT/edci.c

parents 52afb72d fc283a32

Branches

Tags

Loading

Changes 3

Show whitespace changes

Inline Side-by-side

Showing

openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c 0 additions, 18 deletions

openair1/PHY/LTE_TRANSPORT/dlsch_scrambling.c
openair1/PHY/LTE_TRANSPORT/edci.c 135 additions, 54 deletions

openair1/PHY/LTE_TRANSPORT/edci.c
openair1/PHY/impl_defs_lte.h 2 additions, 4 deletions

openair1/PHY/impl_defs_lte.h

with 137 additions and 76 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