Raymond Knopp f7dfb6c6b2 Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement ...

Conflicts:
	cmake_targets/build_oai
	openair1/PHY/LTE_TRANSPORT/prach.c
	openair1/PHY/LTE_TRANSPORT/pucch.c
	openair1/PHY/LTE_UE_TRANSPORT/initial_sync.c
	openair1/SCHED/fapi_l1.c
	openair1/SCHED/phy_procedures_lte_eNb.c
	openair2/LAYER2/MAC/eNB_scheduler.c
	openair2/LAYER2/MAC/eNB_scheduler_RA.c
	openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
	openair2/LAYER2/MAC/eNB_scheduler_primitives.c
	openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-ru.c
	targets/RT/USER/lte-softmodem.h

2018-08-07 19:44:53 +02:00

..

collection

Merge remote-tracking branch 'oai/develop' into oai-integration

2016-10-18 16:27:56 +03:00

hashtable

fix double free bug

2018-01-08 17:07:40 +09:00

itti

log.c simplification, fix usefull functionality which never worked, move all log code from openair2 to common

2018-07-30 20:07:22 +02:00

itti_analyzer

fixed #320 issue

2018-06-25 18:23:36 +02:00

LOG

Merge remote-tracking branch 'origin/develop' into ru_rau_enhancement

2018-08-07 19:44:53 +02:00

msc

Merge branch 'feature-68-enb-agent' into feature-merge-f68

2018-01-24 11:47:28 +01:00

T

minor: bug fix in T tracer 'to_vcd'

2018-08-06 12:26:35 +02:00

telnetsrv

remove compilation warnings, especially when disabling T_TRACER. enhance LOG_M macro implementation, introduce LOG_DEBUG_XXX macro to replace #ifdef DEBUG_XXX

2018-07-30 20:07:22 +02:00

asn1_conversions.h

upgrade license to version 1.1

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

assertions.h

upgrade license to version 1.1

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

load_module_shlib.c

debugging of new directory structure, file renaming, and eNB/UE splitting. dlsim/ulsim functional.

2018-04-09 15:32:49 -07:00

load_module_shlib.h

integration fix: fix license version to 1.1

2018-03-09 16:40:09 +01:00

system.c

warning remove

2018-04-06 15:57:23 +02:00

system.h

upgrade license to version 1.1

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

time_utils.h

integration fix: have a central place of definition for clock_difftime_ns

2017-02-20 10:53:35 +01:00

utils.c

better handle user input in hex_string_to_hex_value

2017-02-02 16:35:45 +01:00

utils.h

better handle user input in hex_string_to_hex_value

2017-02-02 16:35:45 +01:00