Merge branch 'enhancement-10-harmony' of...
Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony Conflicts: openair1/SCHED/phy_procedures_lte_eNb.c targets/RT/USER/lte-enb.c
No related branches found
No related tags found
Showing
- openair1/PHY/INIT/lte_parms.c 22 additions, 1 deletionopenair1/PHY/INIT/lte_parms.c
- openair1/PHY/LTE_TRANSPORT/if4_tools.c 14 additions, 3 deletionsopenair1/PHY/LTE_TRANSPORT/if4_tools.c
- openair1/PHY/impl_defs_lte.h 6 additions, 0 deletionsopenair1/PHY/impl_defs_lte.h
- openair1/SCHED/phy_procedures_lte_eNb.c 5 additions, 4 deletionsopenair1/SCHED/phy_procedures_lte_eNb.c
- targets/RT/USER/lte-enb.c 28 additions, 11 deletionstargets/RT/USER/lte-enb.c
Loading
Please register or sign in to comment