Rohit Gupta 9ab924399c Merge branch 'develop' into feature-38-bladerf ...

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

2016-01-15 12:36:31 +01:00

..

BLADERF/USERSPACE/LIB

Merge branch 'feature-38-bladerf' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-38-bladerf

2016-01-07 10:40:34 +01:00

COMMON

Merge branch 'develop' into feature-38-bladerf

2015-12-27 11:42:41 +01:00

ETHERNET/USERSPACE/LIB

SVN to GIT migration (removed EPC software, updated mailing list address in all files)

2015-10-06 16:24:54 +00:00

EXMIMO

harmonization of pcie_interface.h with firmware

2015-11-23 11:34:03 +01:00

USRP/USERSPACE/LIB

changes from fourmi

2016-01-11 16:17:08 +01:00