Florian Kaltenberger a4f8fff92b Merge remote-tracking branch 'origin/develop' into feature-21-TM7 ...

Conflicts:
	targets/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.c

2016-11-28 12:56:13 +01: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 remote-tracking branch 'origin/develop' into feature-21-TM7

2016-11-28 12:56:13 +01:00

LMSSDR

add licensing info at top of source files

2016-09-27 16:54:39 +02:00

USRP/USERSPACE/LIB

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

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