Merge remote-tracking branch 'origin/feature-15-carrier_aggregation' into...
Merge remote-tracking branch 'origin/feature-15-carrier_aggregation' into feature-31-ff-scheduler-api Conflicts: cmake_targets/CMakeLists.txt openair1/PHY/LTE_TRANSPORT/dci_tools.c openair1/PHY/LTE_TRANSPORT/pucch.c openair1/SCHED/phy_procedures_lte_eNb.c openair2/LAYER2/MAC/eNB_scheduler_dlsch.c openair2/LAYER2/MAC/proto.h openair2/RRC/LITE/rrc_eNB.c
Showing
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
No preview for this file type
This diff is collapsed.
Please register or sign in to comment