Raymond Knopp 45184c769c Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop ...

Conflicts:
	cmake_targets/CMakeLists.txt
	targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
	targets/ARCH/LMSSDR/USERSPACE/LIB/sodera_lib.cpp

2016-10-31 09:58:23 -07:00

..

BLADERF/USERSPACE/LIB

Merge branch 'develop' into feature-131-new-license

2016-10-10 19:25:02 +02:00

COMMON

merge from develop

2016-10-11 18:52:14 +02:00

ETHERNET/USERSPACE/LIB

merge from develop

2016-10-11 18:52:14 +02:00

EXMIMO

Merge branch 'develop' into feature-131-new-license

2016-10-07 13:58:08 +02:00

LMSSDR

Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop

2016-10-31 09:58:23 -07:00

USRP/USERSPACE/LIB

Merge branch 'develop' into feature-131-new-license

2016-10-10 19:25:02 +02:00