Merge branch 'master' into 'new_refactor_toolchains'
# Conflicts: # cmake/toolchain/heptools-dev3.cmake # cmake/toolchain/heptools-dev4.cmake
Showing
- cmake/toolchain/heptools-experimental.cmake 5 additions, 4 deletionscmake/toolchain/heptools-experimental.cmake
- cmake/toolchain/heptools-hsf.cmake 2 additions, 0 deletionscmake/toolchain/heptools-hsf.cmake
- documentation/packages.json 10 additions, 0 deletionsdocumentation/packages.json
- externals/CMakeLists.txt 1 addition, 1 deletionexternals/CMakeLists.txt
- pyexternals/CMakeLists.txt 14 additions, 2 deletionspyexternals/CMakeLists.txt
Loading
Please register or sign in to comment