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

abab672e

Commit abab672e authored 8 years ago by Florian Kaltenberger

Downloads
- Plain Diff

Merge branch 'feature-21-TM7' of...

Merge branch 'feature-21-TM7' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-21-TM7

Conflicts:
	openair1/PHY/INIT/lte_init.c

parents 71336339 b4a6e030

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

openair1/PHY/INIT/lte_init.c 8 additions, 8 deletions

openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c 6 additions, 7 deletions

openair1/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c 117 additions, 3 deletions

openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/SIMULATION/LTE_PHY/dlsim.c 86 additions, 23 deletions

openair1/SIMULATION/LTE_PHY/dlsim.c
openair2/ENB_APP/enb_config.c 1 addition, 1 deletion

openair2/ENB_APP/enb_config.c

with 218 additions and 42 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