cmake_targets/build_oai · e1cc2fe2b81b4569ecc12d59f4123b40b51e2f91 · zhangtu / openairinterface5G

Source project has a limited visibility.

8 years ago

Merge remote-tracking branch 'main/develop' into T · 310b027a

Cédric Roux authored 8 years ago

Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/RT/USER/lte-softmodem.c

310b027a

History

Merge remote-tracking branch 'main/develop' into T

Cédric Roux authored 8 years ago

Conflicts:
	cmake_targets/CMakeLists.txt
	cmake_targets/build_oai
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/RT/USER/lte-softmodem.c