• knopp's avatar
    Merge remote-tracking branch 'origin/develop' into develop-uedirectorysplit · 83b2f1c0
    knopp authored
    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
    83b2f1c0
Name
Last commit
Last update
..
8bit_rxdemux.c Loading commit data...
8bit_txmux.c Loading commit data...
Makefile Loading commit data...
alaw_lut.h Loading commit data...
angle.c Loading commit data...
cadd_sv.c Loading commit data...
cadd_vv.c Loading commit data...
cdot_prod.c Loading commit data...
cmult_sv.c Loading commit data...
cmult_vv.c Loading commit data...
costable.h Loading commit data...
dB_routines.c Loading commit data...
dB_routines.h Loading commit data...
file_output.c Loading commit data...
invSqrt.c Loading commit data...
log2_approx.c Loading commit data...
lte_dfts.c Loading commit data...
lte_phy_scope.c Loading commit data...
lte_phy_scope.h Loading commit data...
lte_phy_scope_tm4.c Loading commit data...
lut.c Loading commit data...
memory_routines.c Loading commit data...
read_F.c Loading commit data...
signal_energy.c Loading commit data...
smbv.c Loading commit data...
smbv.h Loading commit data...
sqrt.c Loading commit data...
time_meas.c Loading commit data...
time_meas.h Loading commit data...
tools_defs.h Loading commit data...
tools_extern.h Loading commit data...
tools_vars.h Loading commit data...
twiddle12288.h Loading commit data...
twiddle1536.h Loading commit data...
twiddle18432.h Loading commit data...
twiddle24576.h Loading commit data...
twiddle6144.h Loading commit data...
twiddles4096.h Loading commit data...
twiddles8192.h Loading commit data...