Cedric Roux f6345f048e Merge remote-tracking branch 'origin/fix-rrc-rel10-compilation-2018-w06' into develop_integration_2018_w06 ...

Conflicts:
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c

2018-02-07 15:12:08 +01:00

..

MAC

Merge remote-tracking branch 'origin/fix-rrc-rel10-compilation-2018-w06' into develop_integration_2018_w06

2018-02-07 15:12:08 +01:00

PDCP_v10.1.0

correcting issues after merge with develop

2018-01-25 06:54:01 -08: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 branch 'develop-nos1-fixes' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-nos1-fixes

2018-01-25 00:00:24 -08:00

register.h

upgrade license to version 1.1

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