Raymond Knopp 45dc7ed608 Merge branch 'enhancement-rfsim' into ru_rau_enhancement ...

Conflicts:
	cmake_targets/build_oai
	openair1/PHY/LTE_ESTIMATION/lte_sync_time.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/if4_tools.c
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/defs_eNB.h
	openair1/PHY/impl_defs_lte.h
	openair2/ENB_APP/enb_config.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/SIMU/USER/channel_sim.c
	targets/SIMU/USER/oaisim.c
	targets/SIMU/USER/oaisim_config.c
	targets/SIMU/USER/oaisim_functions.c

2018-06-10 15:14:09 -07:00

..

BLADERF/USERSPACE/LIB

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00

COMMON

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

2018-05-28 11:53:34 +02:00

ETHERNET/USERSPACE/LIB

Dealing with the case of keeping RRU working if RAU is down

2018-02-21 15:10:42 +01:00

EXMIMO

Fix #582, USER_MODE flag removed

2018-01-11 16:50:50 +01:00

LMSSDR

Merge remote-tracking branch 'origin/update-license' into RU-RAU-split

2017-10-23 15:00:30 +02:00

mobipass

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00

tcp_bridge

basic simulator: initial release

2018-05-02 11:27:41 +02:00

USRP/USERSPACE/LIB

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

2018-05-28 11:53:34 +02:00