Florian Kaltenberger c046eb66a6 Merge remote-tracking branch 'origin/nr-ip-over-LTE-stack' into integration_develop-nr_2019w42 ...

Conflicts:
	executables/nr-softmodem.c
	executables/nr-softmodem.h
	targets/ARCH/rfsimulator/simulator.c

2019-10-14 13:40:03 +02:00

..

ADRV9371_ZC706

Nr cpu affinity2

2019-01-09 20:49:15 +01:00

BLADERF

phy_simulators working again

2019-07-20 17:52:32 +02:00

COMMON

final minor changes before the merge

2019-10-08 18:32:02 +02:00

ETHERNET/USERSPACE/LIB

final minor changes before the merge

2019-10-08 18:32:02 +02:00

IRIS/USERSPACE/LIB

Merge branch 'develop' into feature-127-protocol-split

2019-02-21 20:18:35 +01:00

LMSSDR

develop-nr current as of 16.7.19

2019-07-16 17:06:20 +02:00

rfsimulator

Merge remote-tracking branch 'origin/nr-ip-over-LTE-stack' into integration_develop-nr_2019w42

2019-10-14 13:40:03 +02:00

tcp_bridge

develop-nr current as of 16.7.19

2019-07-16 17:06:20 +02:00

USRP/USERSPACE/LIB

hotfix for gps sync in usrp_lib.cpp

2019-10-02 16:57:21 +02:00