Xiwen JIANG 24645f26c6 Merge branch 'master' into feature-21-TM7 ...

Conflicts:
	openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_llr_computation.c
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair1/SCHED/phy_procedures_lte_ue.c
	openair1/SIMULATION/LTE_PHY/dlsim.c
	openair1/SIMULATION/LTE_PHY/mbmssim.c
	targets/RT/USER/Makefile

2015-10-05 11:27:50 +02:00

..

BITSTREAM

bitstream 16/06/2015 (240A) ".bit .msk .prm .mcs .cfi" & Adding fpga_temporary_loading_desing file

2015-06-16 15:02:23 +00:00

DEFS

astyle --recursive --indent=spaces=2 --style=kr --indent-col1-comments --break-blocks --convert-tabs --max-code-length=200

2015-04-09 09:29:12 +00:00

DRIVER

branch LG_PRE_RELEASE_0.3 reintegration

2015-04-10 13:18:11 +00:00

USERSPACE

Merge branch 'master' into feature-21-TM7

2015-10-05 11:27:50 +02:00