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

..

CENTOS-LTE-EPC-INTEGRATION/CONF

remove COPYING files

2016-09-28 10:45:02 +02:00

E-MBMS

Fix #582, USER_MODE flag removed

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

GENERIC-LTE-EPC

Merge branch 'enhancement-rfsim' into ru_rau_enhancement

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

LOCALIZATION

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

2014-01-09 11:04:45 +00:00

TDDREC

add exmimo octave api env to TDD rec proj

2016-05-31 17:38:01 +02:00