Raymond Knopp 626d107978 Merge branch 'develop' into enhancement-10-harmony ...

Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/SCHED/phy_mac_stub.c
	targets/RT/USER/lte-softmodem.c
	targets/RT/USER/lte-ue.c

2016-06-14 05:41:18 -07:00

..

BLADERF/USERSPACE/LIB

minor typo in BladeRF comments

2016-04-29 18:32:32 +02:00

COMMON

Merge remote-tracking branch 'origin/develop' into bugfix-48-L1L2signaling

2016-03-31 14:36:12 -07:00

ETHERNET/USERSPACE/LIB

updates for rrh configuration params

2016-02-17 13:51:00 +01:00

EXMIMO

fix for kernel 4.2

2016-03-31 16:12:24 +02:00

LMSSDR

Doxygen support for LMSSDR RF

2016-05-02 11:16:18 +02:00

USRP/USERSPACE/LIB

debugging with USRP

2016-06-01 20:44:57 +02:00