Files
openairinterface5g/targets/ARCH
Raymond Knopp 84a1c7377b Merge remote-tracking branch 'origin/develop' into bugfix-48-L1L2signaling
Conflicts:
	openair1/PHY/LTE_TRANSPORT/print_stats.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair1/SCHED/phy_procedures_lte_ue.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.rrh.usrpb210.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
2016-03-17 17:47:16 +01:00
..