Skip to content
Snippets Groups Projects
Commit 83b2f1c0 authored by Raymond Knopp's avatar Raymond Knopp
Browse files

Merge remote-tracking branch 'origin/develop' into develop-uedirectorysplit 

Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
	openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
	openair1/PHY/defs_eNB.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/mac.h
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.h
parents 861d06e8 184d51c6
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 725 additions and 102 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment