Merge branch 'develop' into bugfix-40-channel_bandwidth
Conflicts: openair1/PHY/LTE_TRANSPORT/proto.h
Showing
- cmake_targets/autotests/tools/remove_old_programs.bash~ 0 additions, 7 deletionscmake_targets/autotests/tools/remove_old_programs.bash~
- openair1/PHY/LTE_TRANSPORT/proto.h 2 additions, 2 deletionsopenair1/PHY/LTE_TRANSPORT/proto.h
- openair1/SIMULATION/LTE_PHY/ulsim.c 14 additions, 2 deletionsopenair1/SIMULATION/LTE_PHY/ulsim.c
Loading
Please register or sign in to comment