openair2/LAYER2/MAC/config.c · d32cdd1f334ca0a7bd797106789e1a4fbd454d36 · MAQ5G-PFC / OAI-RAN-5G-sheduler_MaxTBS · GitLab

Snippets Groups Projects

7 years ago
d32cdd1f
Merge remote-tracking branch 'origin/develop' into develop-nos1-fixes · d32cdd1f
Raymond Knopp authored 7 years ago
```
Conflicts:
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/config.c
```
d32cdd1f

History
Merge remote-tracking branch 'origin/develop' into develop-nos1-fixes
Raymond Knopp authored 7 years ago
```
Conflicts:
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/config.c
```