Raymond.Knopp 12cc35932a Merge branch 'develop' into develop-new-LMSSDR ...

Conflicts:
	targets/RT/USER/lte-softmodem.c

2017-01-18 10:44:37 +01:00

..

BLADERF/USERSPACE/LIB

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

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

COMMON

fixing bug introduced in 5c5c336300

2016-11-28 13:58:41 +01:00

ETHERNET/USERSPACE/LIB

merge from develop

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

EXMIMO

Merge branch 'exmimo2_firmware' into develop_integration_wk01

2017-01-06 10:54:37 +01:00

LMSSDR

CMakeList.txt changes for LMSSDR, lmssdr config file 50 PRB, rx gain setting in lms_lib.cpp

2017-01-07 14:55:04 +01:00

USRP/USERSPACE/LIB

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

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