Commit Graph
2 Commits
Author SHA1 Message Date
Raymond Knopp b458c09841 Merge branch 'develop-uedirectorysplit' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-uedirectorysplit
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/LTE_ESTIMATION/lte_adjust_sync.c
	openair1/PHY/LTE_UE_TRANSPORT/dci_ue.c
2018-04-09 15:55:08 -07:00
Guy De Souza 2c83775087 Fix CMakeLists.txt for lte-uesoftmodem 2018-03-21 15:08:01 +01:00