- 
Cedric Roux authoredThere were some conflicts, manually resolved. Conflicts: openair1/PHY/LTE_TRANSPORT/dci_tools.c openair1/SCHED/phy_procedures_lte_ue.c 217eba6b
There were some conflicts, manually resolved. Conflicts: openair1/PHY/LTE_TRANSPORT/dci_tools.c openair1/SCHED/phy_procedures_lte_ue.c
