Raymond Knopp 83b2f1c01c Merge remote-tracking branch 'origin/develop' into develop-uedirectorysplit ...

Conflicts:
	openair1/PHY/INIT/lte_init.c
	openair1/PHY/LTE_TRANSPORT/dci_tools.c
	openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
	openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
	openair1/PHY/defs_eNB.h
	openair1/SCHED_UE/phy_procedures_lte_ue.c
	openair2/LAYER2/MAC/mac.h
	targets/RT/USER/lte-enb.c
	targets/RT/USER/lte-softmodem.h

2018-04-23 23:08:10 -07:00

..

collection

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

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

hashtable

upgrade license to version 1.1

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

itti

Merge branch 'develop' into RU-RAU-split-parallel-EMUFH-phy-test-merge

2018-04-06 15:12:46 +02:00

itti_analyzer

upgrade license to version 1.1

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

msc

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

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

T

integration fix: update T tracer: add new VCD variables

2018-04-12 11:36:31 +02:00

telnetsrv

integration fix: fix license version to 1.1

2018-03-09 16:40:09 +01: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

upgrade license to version 1.1

2017-10-23 12:22:13 +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