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

..

defs.h

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

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

extern.h

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

fapi_l1.c

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

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

fapi_l1.h

Fix NFAPI integration

2018-01-15 15:24:50 +01:00

Makefile.inc

[OAI-UE] SRS feature

2016-10-12 14:29:48 +02:00

phy_mac_stub.c

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

phy_procedures_lte_common.c

Merge branch 'issue255_256_257_paging_reesta_release' into develop_integration_2018_w03

2018-01-17 11:49:44 +01:00

phy_procedures_lte_eNb.c

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

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

phy_procedures_lte_ue.c

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

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

pucch_pc.c

Merge remote-tracking branch 'origin/update-license' into RU-RAU-split

2017-10-23 15:00:30 +02:00

pusch_pc.c

Merge remote-tracking branch 'origin/update-license' into RU-RAU-split

2017-10-23 15:00:30 +02:00

ru_procedures.c

Fix #582, merge from develop

2018-01-16 14:31:23 +01:00

srs_pc.c

upgrade license to version 1.1

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

vars.h

upgrade license to version 1.1

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