Raymond Knopp 219016e7a4 Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony ...

Conflicts:
	openair1/PHY/INIT/lte_init.c
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.c
	targets/SIMU/USER/init_lte.c

2017-01-04 07:18:52 +01:00

..

BLADERF/USERSPACE/LIB

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

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

COMMON

Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony

2017-01-04 07:18:52 +01:00

ETHERNET/USERSPACE/LIB

Merge remote-tracking branch 'origin/develop' into enhancement-10-harmony

2016-12-04 09:46:02 +01:00

EXMIMO

fixing bug introduced in 5c5c336300

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

LMSSDR

add licensing info at top of source files

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

USRP/USERSPACE/LIB

Changes for 20 MHz RRU (dual-thread mode)

2017-01-03 07:46:36 +01:00