Merge remote-tracking branch 'origin/issue321_tdd_config1' into develop_integration_2018_w29
Conflicts: openair2/LAYER2/MAC/eNB_scheduler_primitives.c
No related branches found
No related tags found
Showing
- openair1/PHY/LTE_TRANSPORT/dci_tools_common.c 2 additions, 6 deletionsopenair1/PHY/LTE_TRANSPORT/dci_tools_common.c
- openair1/SCHED/ru_procedures.c 21 additions, 19 deletionsopenair1/SCHED/ru_procedures.c
- openair2/ENB_APP/flexran_agent_defs.h 1 addition, 1 deletionopenair2/ENB_APP/flexran_agent_defs.h
- openair2/LAYER2/MAC/eNB_scheduler_primitives.c 42 additions, 45 deletionsopenair2/LAYER2/MAC/eNB_scheduler_primitives.c
- openair2/LAYER2/PDCP_v10.1.0/pdcp.c 1 addition, 1 deletionopenair2/LAYER2/PDCP_v10.1.0/pdcp.c
- openair2/RRC/LTE/rrc_eNB_S1AP.c 1 addition, 1 deletionopenair2/RRC/LTE/rrc_eNB_S1AP.c
- openair2/UTIL/LOG/log.c 41 additions, 6 deletionsopenair2/UTIL/LOG/log.c
- targets/RT/USER/lte-ru.c 4 additions, 1 deletiontargets/RT/USER/lte-ru.c
- targets/RT/USER/lte-softmodem.c 1 addition, 0 deletionstargets/RT/USER/lte-softmodem.c
Loading
Please register or sign in to comment