executables/nr-softmodem-common.h · 6be2d8f081eb03c6746e7cf683b17cf043b48b71 · oai / openairinterface5G · GitLab

Snippets Groups Projects

Something went wrong on our end

5 years ago
c046eb66
Merge remote-tracking branch 'origin/nr-ip-over-LTE-stack' into integration_develop-nr_2019w42 · c046eb66
Florian Kaltenberger authored 5 years ago
```
Conflicts:
	executables/nr-softmodem.c
	executables/nr-softmodem.h
	targets/ARCH/rfsimulator/simulator.c
```
c046eb66

History
Merge remote-tracking branch 'origin/nr-ip-over-LTE-stack' into integration_develop-nr_2019w42
Florian Kaltenberger authored 5 years ago
```
Conflicts:
	executables/nr-softmodem.c
	executables/nr-softmodem.h
	targets/ARCH/rfsimulator/simulator.c
```