Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

openairinterface5G
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

b046b071

Commit b046b071 authored 8 years ago by knopp

Downloads
- Plain Diff

Merge branch 'enhancement-10-harmony' of...

Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony

Conflicts:
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf

parents 64121aaf 95453cf3

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

openair1/PHY/LTE_TRANSPORT/if4_tools.c 2 additions, 2 deletions

openair1/PHY/LTE_TRANSPORT/if4_tools.c
openair1/PHY/LTE_TRANSPORT/prach.c 1 addition, 20 deletions

openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/TOOLS/lte_dfts.c 1 addition, 1 deletion

openair1/PHY/TOOLS/lte_dfts.c
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf 3 additions, 0 deletions

...OJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.bladerfx40.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.exmimo2.conf 3 additions, 0 deletions

.../PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.exmimo2.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.lmssdr.conf 3 additions, 0 deletions

...s/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.lmssdr.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf 7 additions, 7 deletions

...PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpx310.conf 3 additions, 0 deletions

...PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpx310.conf
targets/RT/USER/lte-enb.c 23 additions, 16 deletions

targets/RT/USER/lte-enb.c

with 46 additions and 46 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