Raymond Knopp 72b5745abb Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement-external-timing ...

Conflicts:
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/defs_eNB.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair1/SIMULATION/LTE_PHY/dlsim.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-softmodem.h
	targets/RT/USER/lte-uesoftmodem.c
	targets/RT/USER/rfsim.c

2019-01-26 11:54:10 +01:00

..

common_lib.c

Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement-external-timing

2019-01-26 11:54:10 +01:00

common_lib.h

Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement-external-timing

2019-01-26 11:54:10 +01:00