mirror of https://github.com/pvnis/srsRAN_4G.git
Merge branch 'master' of https://github.com/libLTE/libLTE
Conflicts: lte/examples/cell_search.c lte/phy/examples/cell_search_utils.c lte/phy/examples/iodev.c lte/phy/examples/iodev.h lte/phy/examples/pdsch_ue.c lte/phy/include/liblte/phy/ch_estimation/chest.h lte/phy/include/liblte/phy/ch_estimation/refsignal.h lte/phy/include/liblte/phy/common/phy_common.h lte/phy/include/liblte/phy/sync/sync.h lte/phy/include/liblte/phy/ue/ue_celldetect.h lte/phy/include/liblte/phy/ue/ue_mib.h lte/phy/include/liblte/phy/utils/vector.h lte/phy/lib/ch_estimation/src/chest.c lte/phy/lib/ch_estimation/src/refsignal.c lte/phy/lib/ch_estimation/test/CMakeLists.txt lte/phy/lib/ch_estimation/test/chest_test.c lte/phy/lib/ch_estimation/test/chest_test_dl.c lte/phy/lib/ch_estimation/test/chest_test_ul.c lte/phy/lib/phch/src/pdsch.c lte/phy/lib/sync/src/pss.c lte/phy/lib/sync/src/sync.c lte/phy/lib/sync/test/pss_usrp.c lte/phy/lib/ue/src/ue_celldetect.c lte/phy/lib/ue/src/ue_dl.c lte/phy/lib/ue/src/ue_mib.c lte/phy/lib/ue/src/ue_sync.c lte/phy/lib/ue/test/ue_celldetect_mib_test.c lte/rrc/include/liblte/rrc/rrc.h lte/rrc/lib/messages/test/CMakeLists.txtmaster
commit
ee8ff24c43