Merge remote-tracking branch 'origin/develop' into develop-nos1-fixes
Conflicts: openair1/SCHED/fapi_l1.c openair1/SCHED/phy_procedures_lte_eNb.c openair2/LAYER2/MAC/config.c
Showing
nfapi/README
0 → 100644
This diff is collapsed.
This diff is collapsed.
nfapi/open-nFAPI/.travis.yml
0 → 100644
nfapi/open-nFAPI/LICENSE.md
0 → 100644