openair1/PHY/impl_defs_top.h · bd4898222fa0820cf5041517f6fc4375e513737d · Shweta Shrivastava / openairinterface5G

Something went wrong on our end

Blame

Forked from oai / openairinterface5G

Source project has a limited visibility.

8 years ago

f92bd915

Merge branch 'enhancement-199-nas-multi-ue' into develop_integration_w07 · f92bd915

Cédric Roux authored 8 years ago

 Conflicts:
	openair1/SCHED/phy_procedures_lte_ue.c
	targets/RT/USER/lte-softmodem.c
	targets/SIMU/USER/oaisim.c
	targets/SIMU/USER/oaisim_functions.c

f92bd915

History

Merge branch 'enhancement-199-nas-multi-ue' into develop_integration_w07

Cédric Roux authored 8 years ago

 Conflicts:
	openair1/SCHED/phy_procedures_lte_ue.c
	targets/RT/USER/lte-softmodem.c
	targets/SIMU/USER/oaisim.c
	targets/SIMU/USER/oaisim_functions.c