gauthier a59cabd1dd Merge branch 'develop' into bugfix-48-L1L2signaling ...

Conflicts:
	openair1/SCHED/phy_procedures_lte_eNb.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf

2015-12-21 18:45:27 +01: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 'develop' into bugfix-48-L1L2signaling

2015-12-21 18:45:27 +01:00

Makefile

branch LG_PRE_RELEASE_0.3 reintegration

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