Raymond Knopp da83df84f1 Merge remote-tracking branch 'origin/develop' into dlsim-ulsim-fix ...

Conflicts:
	openair1/PHY/INIT/lte_init.c

2018-02-18 01:39:36 -08:00

..

MAC

Merge remote-tracking branch 'origin/develop' into dlsim-ulsim-fix

2018-02-18 01:39:36 -08:00

PDCP_v10.1.0

Merge remote-tracking branch 'origin/feature-merge-merge-f68' into develop_integration_2018_w07

2018-02-15 09:58:26 +01:00

RLC

Merge remote-tracking branch 'origin/282-flags-cleanup' into develop_integration_2018_w04

2018-01-22 17:47:01 +01:00

Makefile.inc

Fix #582, RTAI, RTAI_ENABLED, ENABLE_RTAI_CLOCK, RTAI_ISNT_POSIX, _RTAI_MATH_H, CELLULAR, TIMER_ONESHOT_MODE, EMOS, EMOS_CHANNEL, OAI_EMU, OPENAIR_EMU, PHY_ABSTRACTION, PHY_ABSTRACTION_UL removed

2018-01-15 18:47:07 +01:00

openair2_proc.c

bugfix: fix bad conflict resolutions from previous commits

2018-02-16 11:11:50 +01:00

register.h

upgrade license to version 1.1

2017-10-23 12:22:13 +02:00