Merge branch 'enhancement-10-harmony' of...
Merge branch 'enhancement-10-harmony' of https://gitlab.eurecom.fr/oai/openairinterface5g into enhancement-10-harmony Conflicts: openair1/PHY/defs.h targets/RT/USER/lte-enb.c targets/RT/USER/lte-softmodem.c
No related branches found
No related tags found
Showing
- openair1/PHY/defs.h 0 additions, 9 deletionsopenair1/PHY/defs.h
- openair1/SCHED/phy_procedures_lte_eNb.c 24 additions, 29 deletionsopenair1/SCHED/phy_procedures_lte_eNb.c
- openair2/ENB_APP/enb_config.c 26 additions, 14 deletionsopenair2/ENB_APP/enb_config.c
- openair2/ENB_APP/enb_config.h 1 addition, 0 deletionsopenair2/ENB_APP/enb_config.h
- targets/RT/USER/lte-enb.c 75 additions, 95 deletionstargets/RT/USER/lte-enb.c
- targets/RT/USER/lte-softmodem.c 25 additions, 71 deletionstargets/RT/USER/lte-softmodem.c
- targets/SIMU/USER/oaisim_functions.c 1 addition, 1 deletiontargets/SIMU/USER/oaisim_functions.c
Loading
Please register or sign in to comment