Skip to content
GitLab
Explore
Sign in
Register
oai
openairinterface5G
Repository
openairinterface5g
cmake_targets
tools
build_helper
Find file
Blame
History
Permalink
Merge remote-tracking branch 'oai/develop' into oai-integration
· 0f5b0145
Xenofon Foukas
authored
May 17, 2016
Conflicts: openair1/SCHED/phy_procedures_lte_eNb.c openair2/LAYER2/MAC/eNB_scheduler.c
0f5b0145