Raymond Knopp f8b0cd5bd4 Merge remote-tracking branch 'origin/develop' into develop-nos1-fixes ...

Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair2/RRC/LITE/rrc_UE.c

2018-01-24 23:36:39 -08:00

..

MAC

Merge remote-tracking branch 'origin/develop' into develop-nos1-fixes

2018-01-24 23:36:39 -08:00

PDCP_v10.1.0

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

2018-01-22 17:47:01 +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

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

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

register.h

upgrade license to version 1.1

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