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

Browse Source

Conflicts:
	openair1/SCHED/phy_procedures_lte_ue.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c

...

This commit is contained in:

Raymond Knopp

2016-07-14 12:52:21 +02:00

parent 64e3d4f651 5ae509b2de

commit 89a9be9b9f

40 changed files with 3997 additions and 4495 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

openair1/SIMULATION/LTE_PHY/dlsim.c

+1421 -1649

File diff suppressed because it is too large Load Diff