Raymond Knopp 89a9be9b9f Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony ...

Conflicts:
	openair1/SCHED/phy_procedures_lte_ue.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c

2016-07-14 12:52:21 +02:00

..

COPYING

adding/updating license to GPL3

2014-08-14 11:39:48 +00:00

Makefile.inc

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

2014-07-15 11:10:06 +00:00

usrp_lib.cpp

Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony

2016-07-14 12:52:21 +02:00