Merge remote-tracking branch 'origin/generate_sss_tables' into develop_integration_2018_w36
Conflicts: openair1/PHY/INIT/init_top.c
Showing
- cmake_targets/CMakeLists.txt 2 additions, 0 deletionscmake_targets/CMakeLists.txt
- openair1/PHY/INIT/init_top.c 3 additions, 0 deletionsopenair1/PHY/INIT/init_top.c
- openair1/PHY/LTE_TRANSPORT/sss.h 0 additions, 25 deletionsopenair1/PHY/LTE_TRANSPORT/sss.h
- openair1/PHY/LTE_TRANSPORT/sss_gen.c 68 additions, 0 deletionsopenair1/PHY/LTE_TRANSPORT/sss_gen.c
- openair1/PHY/LTE_TRANSPORT/sss_gen.m 0 additions, 53 deletionsopenair1/PHY/LTE_TRANSPORT/sss_gen.m
- openair1/PHY/LTE_TRANSPORT/transport_extern.h 1 addition, 1 deletionopenair1/PHY/LTE_TRANSPORT/transport_extern.h
- openair1/PHY/LTE_TRANSPORT/transport_vars.h 0 additions, 1 deletionopenair1/PHY/LTE_TRANSPORT/transport_vars.h
Loading
Please register or sign in to comment