Raymond Knopp f7dfb6c6b2 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement ...

Conflicts:
	cmake_targets/build_oai
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.h

2018-08-07 19:44:53 +02:00

..

Makefile.inc

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5498 818b1a75-f10b-46b9-bf7c-635c3b92a50f

2014-07-15 11:10:06 +00:00

usrp_lib.cpp

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

2018-08-07 19:44:53 +02:00

usrp_lib.h

fix issue 310 IQrecplay

2018-06-04 13:05:13 +02:00