Florian Kaltenberger b8494221bd Merge branch 'enhancement-16-tm_rrc_reconfig' into feature-21-TM7 ...

Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/INIT/lte_param_init.c
	openair1/PHY/INIT/lte_parms.c
	openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
	openair2/RRC/LITE/MESSAGES/asn1_msg.c
	openair2/RRC/LITE/defs.h
	openair2/RRC/LITE/rrc_eNB.c
	targets/RT/USER/lte-softmodem.c
	targets/SIMU/USER/init_lte.c

2016-08-23 15:13:55 +02:00

..

LAUNCH_SCRIPTS

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

2014-06-13 16:39:57 +00:00

USER

Merge branch 'enhancement-16-tm_rrc_reconfig' into feature-21-TM7

2016-08-23 15:13:55 +02:00

Makefile

branch LG_PRE_RELEASE_0.3 reintegration

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