• knopp's avatar
    Merge branch 'develop' into enhancement-10-harmony · 7678f88a
    knopp authored
    Conflicts:
    	cmake_targets/autotests/test_case_list.xml
    	openair1/PHY/INIT/lte_init.c
    	openair1/PHY/INIT/lte_param_init.c
    	openair1/PHY/LTE_TRANSPORT/pucch.c
    	openair1/SIMULATION/LTE_PHY/pdcchsim.c
    	openair2/ENB_APP/enb_config.h
    	openair2/RRC/LITE/rrc_eNB.c
    	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.generic.oaisim.local_no_mme.conf
    	targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.usrpb210.conf
    	targets/RT/USER/lte-softmodem.c
    	targets/SIMU/USER/init_lte.c
    	targets/SIMU/USER/oaisim.c
    	targets/SIMU/USER/oaisim_functions.c
    7678f88a
Name
Last commit
Last update
cmake_targets Loading commit data...
common/utils Loading commit data...
openair1 Loading commit data...
openair2 Loading commit data...
openair3 Loading commit data...
svn2git Loading commit data...
targets Loading commit data...
.gitlab-ci.yml Loading commit data...
COPYING Loading commit data...
README.txt Loading commit data...
maketags Loading commit data...
oaienv Loading commit data...