Cedric Roux 7a724e7d2e Merge remote-tracking branch 'origin/develop' into feature-131-new-license ...

Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/phy_procedures_lte_ue.c
	openair1/SIMULATION/LTE_PHY/dlsim.c
	openair1/SIMULATION/RF/adc.c
	openair2/LAYER2/MAC/lte_transport_init.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/sched_dlsch.c
	targets/RT/USER/sched_rx_pdsch.c
	targets/RT/USER/sched_ulsch.c
	targets/SIMU/USER/oaisim.c

2016-09-27 15:05:00 +02:00

..

at_commands

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00

autotests

Merge branch 'develop' into enhancement-10-harmony

2016-09-27 10:39:28 +02:00

doxygen

Cmake File for doxygen building

2015-06-15 14:09:02 +00:00

epc_test

fix LOWLATENCY name

2016-05-16 11:39:43 +02:00

lte_noS1_build_oai

adding a new option --noS1 to build_script that will now either compile the softmodem or oaisim with or without the S1 interface (instead of doing both of them)

2015-07-15 16:52:04 +00:00

lte-simulators

xforms now command line option for ulsim and dlsim

2016-03-01 16:36:42 +01:00

nas_sim_tools

renamed openair-cn to openair3

2015-10-06 16:53:42 +00:00

oaisim_build_oai

fix LOWLATENCY name

2016-05-16 11:39:43 +02:00

oaisim_mme_build_oai

fix LOWLATENCY name

2016-05-16 11:39:43 +02:00

oaisim_noS1_build_oai

fix LOWLATENCY name

2016-05-16 11:39:43 +02:00

s1c_mme_test

fix LOWLATENCY name

2016-05-16 11:39:43 +02:00

tools

add NTP for synch time between test setup machines

2016-09-26 14:21:35 +02:00

build_oai

Gitlab CI test case modified file + disable cpu affinity

2016-09-27 10:38:13 +02:00

CMakeLists.txt

Merge remote-tracking branch 'origin/develop' into feature-131-new-license

2016-09-27 15:05:00 +02:00