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

This commit is contained in:

Cedric Roux

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

parent f06dd02fe8 e08e2577f5

commit 7a724e7d2e

200 changed files with 22970 additions and 19972 deletions

									
										openair1/PHY/INIT/init_top.c
									
		+1
		-1
	
												View File
												
				@@ -17,7 +17,7 @@

				*/

				//#define DEBUG_PHY

				t

				/*