Merge branch 'enhancement-10-harmony' into develop_integration_w03
Conflicts: targets/RT/USER/lte-enb.c targets/RT/USER/lte-softmodem.c
Showing
openair1/PHY/LTE_TRANSPORT/if4_tools.c
100644 → 100755
This diff is collapsed.
This diff is collapsed.