Skip to content
Snippets Groups Projects
Commit 5c42515f authored by Dmitri Konstantinov's avatar Dmitri Konstantinov
Browse files

Merge branch 'master' into 'new_refactor_toolchains'

# Conflicts:
#   cmake/toolchain/heptools-dev3.cmake
#   cmake/toolchain/heptools-dev4.cmake
parents f0b63044 d17e4789
No related branches found
No related tags found
1 merge request!101New refactor toolchains
Pipeline #519282 passed
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment